From 6718fb8bd65df317722373ae401bd769851b3476 Mon Sep 17 00:00:00 2001 From: Abhishek Arya Date: Thu, 17 Dec 2020 16:29:11 -0800 Subject: [PATCH] Fix broken blackbox fuzzer projects. (#4865) * Fix broken blackbox fuzzer projects. Regression from https://github.com/google/oss-fuzz/pull/4769/files * Fix indent. --- infra/base-images/base-runner/test_all.py | 9 +++++---- projects/jsc/project.yaml | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/infra/base-images/base-runner/test_all.py b/infra/base-images/base-runner/test_all.py index dfa38260f..c97079e0e 100755 --- a/infra/base-images/base-runner/test_all.py +++ b/infra/base-images/base-runner/test_all.py @@ -74,12 +74,13 @@ def find_fuzz_targets(directory, fuzzing_language): continue if not os.stat(path).st_mode & EXECUTABLE: continue - with open(path, 'rb') as file_handle: - binary_contents = file_handle.read() - if b'LLVMFuzzerTestOneInput' not in binary_contents: - continue if fuzzing_language != 'python' and not is_elf(path): continue + if os.getenv('FUZZING_ENGINE') != 'none': + with open(path, 'rb') as file_handle: + binary_contents = file_handle.read() + if b'LLVMFuzzerTestOneInput' not in binary_contents: + continue fuzz_targets.append(path) return fuzz_targets diff --git a/projects/jsc/project.yaml b/projects/jsc/project.yaml index 980acc751..1f1016f8f 100644 --- a/projects/jsc/project.yaml +++ b/projects/jsc/project.yaml @@ -1,9 +1,6 @@ homepage: https://webkit.org/ language: c++ -fuzzing_engines: - - none -sanitizers: - - address +primary_contact: "ddkilzer@apple.com" auto_ccs: - "mark.lam@apple.com" - "akilsrin@apple.com" @@ -11,4 +8,9 @@ auto_ccs: - "jfb@chromium.org" - "sbarati@apple.com" - "ysuzuki@apple.com" +fuzzing_engines: + - none +sanitizers: + - address blackbox: true +main_repo: 'git://git.webkit.org/WebKit.git'