From 308039ea2587b9084d02264f3bf018d1ee6d3ce3 Mon Sep 17 00:00:00 2001 From: Jiradet Ounjai Date: Tue, 5 Sep 2023 10:52:13 +0700 Subject: [PATCH] fix: invalid oss-fuzz corpus download url --- benchmarks/php_php-fuzz-parser_0dbedb/benchmark.yaml | 1 + benchmarks/stb_stbi_read_fuzzer/benchmark.yaml | 1 + common/benchmark_utils.py | 2 ++ experiment/run_experiment.py | 7 +++++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/benchmarks/php_php-fuzz-parser_0dbedb/benchmark.yaml b/benchmarks/php_php-fuzz-parser_0dbedb/benchmark.yaml index 183792f1c..e38fbb2d3 100644 --- a/benchmarks/php_php-fuzz-parser_0dbedb/benchmark.yaml +++ b/benchmarks/php_php-fuzz-parser_0dbedb/benchmark.yaml @@ -4,6 +4,7 @@ commit_date: 2022-07-15T10:03:12+0000 fuzz_target: php-fuzz-parser project: php type: bug +oss_fuzz_corpus_target: php_php-fuzz-parser unsupported_fuzzers: - aflcc - afl_qemu diff --git a/benchmarks/stb_stbi_read_fuzzer/benchmark.yaml b/benchmarks/stb_stbi_read_fuzzer/benchmark.yaml index fd7474143..d527efefb 100644 --- a/benchmarks/stb_stbi_read_fuzzer/benchmark.yaml +++ b/benchmarks/stb_stbi_read_fuzzer/benchmark.yaml @@ -2,6 +2,7 @@ commit: 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 commit_date: 2023-01-29T18:46:04+00:00 fuzz_target: stbi_read_fuzzer project: stb +oss_fuzz_corpus_target: stb_stbi_read_fuzzer unsupported_fuzzers: - aflcc - afl_qemu diff --git a/common/benchmark_utils.py b/common/benchmark_utils.py index 3a3550db5..2c91957f0 100644 --- a/common/benchmark_utils.py +++ b/common/benchmark_utils.py @@ -52,6 +52,8 @@ def get_project(benchmark): """Returns the project of |benchmark|""" return benchmark_config.get_config(benchmark)['project'] +def get_oss_fuzz_corpus_target(benchmark): + return benchmark_config.get_config(benchmark).get('oss_fuzz_corpus_target') def get_type(benchmark): """Returns the type of |benchmark|""" diff --git a/experiment/run_experiment.py b/experiment/run_experiment.py index 9da881816..90492b753 100644 --- a/experiment/run_experiment.py +++ b/experiment/run_experiment.py @@ -378,8 +378,11 @@ def add_oss_fuzz_corpus(benchmark, oss_fuzz_corpora_dir): fuzz targets.""" project = benchmark_utils.get_project(benchmark) fuzz_target = benchmark_utils.get_fuzz_target(benchmark) - - if not fuzz_target.startswith(project): + oss_fuzz_corpus_target = benchmark_utils.get_oss_fuzz_corpus_target(benchmark) + + if oss_fuzz_corpus_target: + full_fuzz_target = oss_fuzz_corpus_target + elif not fuzz_target.startswith(project): full_fuzz_target = f'{project}_{fuzz_target}' else: full_fuzz_target = fuzz_target