From 63868cba907a461b9cc3ba1372744f4c44088821 Mon Sep 17 00:00:00 2001 From: werdnaH <32367543+werdnaH@users.noreply.github.com> Date: Sun, 21 Jun 2020 23:35:58 +0000 Subject: [PATCH] [skia] Remove Options Files with Only max_len Flag (#3987) * [skia] add svg fuzzer * [skia] removed options file * [skia] removed options file * [skia] removed all options files with only max_len * delete options * fixed cp statements Co-authored-by: Zepeng Hu --- projects/skia/Dockerfile | 31 ------------------- projects/skia/api_fuzzers.options | 2 -- projects/skia/build.sh | 27 ---------------- projects/skia/encoder.options | 2 -- projects/skia/image_codec.options | 2 -- .../skia/image_filter_deserialize.options | 3 -- projects/skia/path_deserialize.options | 2 -- projects/skia/region_deserialize.options | 2 -- projects/skia/region_set_path.options | 2 -- .../skia/skdescriptor_deserialize.options | 2 -- projects/skia/sksl.options | 2 -- projects/skia/textblob_deserialize.options | 2 -- 12 files changed, 79 deletions(-) delete mode 100644 projects/skia/api_fuzzers.options delete mode 100644 projects/skia/encoder.options delete mode 100644 projects/skia/image_codec.options delete mode 100644 projects/skia/image_filter_deserialize.options delete mode 100644 projects/skia/path_deserialize.options delete mode 100644 projects/skia/region_deserialize.options delete mode 100644 projects/skia/region_set_path.options delete mode 100644 projects/skia/skdescriptor_deserialize.options delete mode 100644 projects/skia/sksl.options delete mode 100644 projects/skia/textblob_deserialize.options diff --git a/projects/skia/Dockerfile b/projects/skia/Dockerfile index 42b8a45bd..fd2b97e4c 100644 --- a/projects/skia/Dockerfile +++ b/projects/skia/Dockerfile @@ -80,38 +80,7 @@ COPY build.sh $SRC/ COPY skia.diff $SRC/skia/skia.diff RUN git apply skia.diff -COPY region_deserialize.options $SRC/skia/region_deserialize.options -COPY region_set_path.options $SRC/skia/region_set_path.options -COPY image_filter_deserialize.options $SRC/skia/image_filter_deserialize.options COPY image_filter_deserialize_width.options $SRC/skia/image_filter_deserialize_width.options -COPY textblob_deserialize.options $SRC/skia/textblob_deserialize.options -COPY path_deserialize.options $SRC/skia/path_deserialize.options -COPY encoder.options $SRC/skia/encoder.options -COPY skdescriptor_deserialize.options $SRC/skia/skdescriptor_deserialize.options - -# Codec fuzzers can share options -COPY image_codec.options $SRC/skia/android_codec.options -COPY image_codec.options $SRC/skia/animated_image_decode.options -COPY image_codec.options $SRC/skia/image_decode.options -COPY image_codec.options $SRC/skia/image_decode_incremental.options - -# API fuzzers can share options -COPY api_fuzzers.options $SRC/skia/api_draw_functions.options -COPY api_fuzzers.options $SRC/skia/api_gradients.options -COPY api_fuzzers.options $SRC/skia/api_image_filter.options -COPY api_fuzzers.options $SRC/skia/api_mock_gpu_canvas.options -COPY api_fuzzers.options $SRC/skia/api_null_canvas.options -COPY api_fuzzers.options $SRC/skia/api_path_measure.options -COPY api_fuzzers.options $SRC/skia/api_pathop.options -COPY api_fuzzers.options $SRC/skia/api_polyutils.options -COPY api_fuzzers.options $SRC/skia/api_raster_n32_canvas.options -COPY api_fuzzers.options $SRC/skia/api_skdescriptor.options - -# SKSL fuzzers can share options -COPY sksl.options $SRC/skia/sksl2glsl.options -COPY sksl.options $SRC/skia/sksl2spirv.options -COPY sksl.options $SRC/skia/sksl2metal.options -COPY sksl.options $SRC/skia/sksl2pipeline.options COPY json.dict $SRC/skia/json.dict diff --git a/projects/skia/api_fuzzers.options b/projects/skia/api_fuzzers.options deleted file mode 100644 index a48b65724..000000000 --- a/projects/skia/api_fuzzers.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 4000 \ No newline at end of file diff --git a/projects/skia/build.sh b/projects/skia/build.sh index 93a12c153..8f94083a7 100644 --- a/projects/skia/build.sh +++ b/projects/skia/build.sh @@ -118,30 +118,23 @@ $SRC/depot_tools/ninja -C out/Fuzz_mem_constraints image_filter_deserialize \ api_mock_gpu_canvas cp out/Fuzz/region_deserialize $OUT/region_deserialize -cp ./region_deserialize.options $OUT/region_deserialize.options cp out/Fuzz/region_set_path $OUT/region_set_path -cp ./region_set_path.options $OUT/region_set_path.options cp ./region_set_path_seed_corpus.zip $OUT/region_set_path_seed_corpus.zip cp out/Fuzz/textblob_deserialize $OUT/textblob_deserialize -cp ./textblob_deserialize.options $OUT/textblob_deserialize.options cp ./textblob_deserialize_seed_corpus.zip $OUT/textblob_deserialize_seed_corpus.zip cp out/Fuzz/path_deserialize $OUT/path_deserialize -cp ./path_deserialize.options $OUT/path_deserialize.options cp ./path_deserialize_seed_corpus.zip $OUT/path_deserialize_seed_corpus.zip cp out/Fuzz/image_decode $OUT/image_decode -cp ./image_decode.options $OUT/image_decode.options cp ./image_decode_seed_corpus.zip $OUT/image_decode_seed_corpus.zip cp out/Fuzz/animated_image_decode $OUT/animated_image_decode -cp ./animated_image_decode.options $OUT/animated_image_decode.options cp ./animated_image_decode_seed_corpus.zip $OUT/animated_image_decode_seed_corpus.zip cp out/Fuzz_mem_constraints/image_filter_deserialize $OUT/image_filter_deserialize -cp ./image_filter_deserialize.options $OUT/image_filter_deserialize.options cp ./image_filter_deserialize_seed_corpus.zip $OUT/image_filter_deserialize_seed_corpus.zip # Only create the width version of image_filter_deserialize if building with @@ -156,31 +149,24 @@ then fi cp out/Fuzz/api_draw_functions $OUT/api_draw_functions -cp ./api_draw_functions.options $OUT/api_draw_functions.options cp ./api_draw_functions_seed_corpus.zip $OUT/api_draw_functions_seed_corpus.zip cp out/Fuzz/api_gradients $OUT/api_gradients -cp ./api_gradients.options $OUT/api_gradients.options cp ./api_gradients_seed_corpus.zip $OUT/api_gradients_seed_corpus.zip cp out/Fuzz/api_path_measure $OUT/api_path_measure -cp ./api_path_measure.options $OUT/api_path_measure.options cp ./api_path_measure_seed_corpus.zip $OUT/api_path_measure_seed_corpus.zip cp out/Fuzz/api_pathop $OUT/api_pathop -cp ./api_pathop.options $OUT/api_pathop.options cp ./api_pathop_seed_corpus.zip $OUT/api_pathop_seed_corpus.zip cp out/Fuzz/png_encoder $OUT/png_encoder -cp ./encoder.options $OUT/png_encoder.options cp ./encoder_seed_corpus.zip $OUT/png_encoder_seed_corpus.zip cp out/Fuzz/jpeg_encoder $OUT/jpeg_encoder -cp ./encoder.options $OUT/jpeg_encoder.options cp ./encoder_seed_corpus.zip $OUT/jpeg_encoder_seed_corpus.zip cp out/Fuzz/webp_encoder $OUT/webp_encoder -cp ./encoder.options $OUT/webp_encoder.options cp ./encoder_seed_corpus.zip $OUT/webp_encoder_seed_corpus.zip cp out/Fuzz/skottie_json $OUT/skottie_json @@ -191,57 +177,44 @@ cp json.dict $OUT/skjson.dict cp ./skjson_seed_corpus.zip $OUT/skjson_seed_corpus.zip cp out/Fuzz_mem_constraints/api_mock_gpu_canvas $OUT/api_mock_gpu_canvas -cp ./api_mock_gpu_canvas.options $OUT/api_mock_gpu_canvas.options cp ./canvas_seed_corpus.zip $OUT/api_mock_gpu_canvas_seed_corpus.zip cp out/Fuzz_mem_constraints/api_raster_n32_canvas $OUT/api_raster_n32_canvas -cp ./api_raster_n32_canvas.options $OUT/api_raster_n32_canvas.options cp ./canvas_seed_corpus.zip $OUT/api_raster_n32_canvas_seed_corpus.zip cp out/Fuzz/api_image_filter $OUT/api_image_filter -cp ./api_image_filter.options $OUT/api_image_filter.options cp ./api_image_filter_seed_corpus.zip $OUT/api_image_filter_seed_corpus.zip cp out/Fuzz/api_null_canvas $OUT/api_null_canvas -cp ./api_null_canvas.options $OUT/api_null_canvas.options cp ./canvas_seed_corpus.zip $OUT/api_null_canvas_seed_corpus.zip cp out/Fuzz/api_polyutils $OUT/api_polyutils -cp ./api_polyutils.options $OUT/api_polyutils.options cp ./api_polyutils_seed_corpus.zip $OUT/api_polyutils_seed_corpus.zip # These 2 can use the same corpus as the (non animated) image_decode. cp out/Fuzz/android_codec $OUT/android_codec -cp ./android_codec.options $OUT/android_codec.options cp ./image_decode_seed_corpus.zip $OUT/android_codec_seed_corpus.zip. cp out/Fuzz/image_decode_incremental $OUT/image_decode_incremental -cp ./image_decode_incremental.options $OUT/image_decode_incremental.options cp ./image_decode_seed_corpus.zip $OUT/image_decode_incremental_seed_corpus.zip cp out/Fuzz/sksl2glsl $OUT/sksl2glsl -cp ./sksl2glsl.options $OUT/sksl2glsl.options cp ./sksl_seed_corpus.zip $OUT/sksl2glsl_seed_corpus.zip cp out/Fuzz/sksl2spirv $OUT/sksl2spirv -cp ./sksl2spirv.options $OUT/sksl2spirv.options cp ./sksl_seed_corpus.zip $OUT/sksl2spirv_seed_corpus.zip cp out/Fuzz/sksl2metal $OUT/sksl2metal -cp ./sksl2metal.options $OUT/sksl2metal.options cp ./sksl_seed_corpus.zip $OUT/sksl2metal_seed_corpus.zip cp out/Fuzz/sksl2pipeline $OUT/sksl2pipeline -cp ./sksl2pipeline.options $OUT/sksl2pipeline.options cp ./sksl_seed_corpus.zip $OUT/sksl2pipeline_seed_corpus.zip cp out/Fuzz/api_skdescriptor $OUT/api_skdescriptor -cp ./api_skdescriptor.options $OUT/api_skdescriptor.options cp ./api_skdescriptor_seed_corpus.zip $OUT/api_skdescriptor_seed_corpus.zip # Don't have any examples of an SkDescriptor atm, so some random bytes is all we have. cp out/Fuzz/skdescriptor_deserialize $OUT/skdescriptor_deserialize -cp ./skdescriptor_deserialize.options $OUT/skdescriptor_deserialize.options cp ./api_skdescriptor_seed_corpus.zip $OUT/skdescriptor_deserialize_seed_corpus.zip cp out/Fuzz/svg_dom $OUT/svg_dom diff --git a/projects/skia/encoder.options b/projects/skia/encoder.options deleted file mode 100644 index a36050270..000000000 --- a/projects/skia/encoder.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 262150 \ No newline at end of file diff --git a/projects/skia/image_codec.options b/projects/skia/image_codec.options deleted file mode 100644 index 470974194..000000000 --- a/projects/skia/image_codec.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 10240 \ No newline at end of file diff --git a/projects/skia/image_filter_deserialize.options b/projects/skia/image_filter_deserialize.options deleted file mode 100644 index 0bde038f2..000000000 --- a/projects/skia/image_filter_deserialize.options +++ /dev/null @@ -1,3 +0,0 @@ -[libfuzzer] -max_len = 10024 -timeout = 10 diff --git a/projects/skia/path_deserialize.options b/projects/skia/path_deserialize.options deleted file mode 100644 index 9b7b54dbd..000000000 --- a/projects/skia/path_deserialize.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 2000 \ No newline at end of file diff --git a/projects/skia/region_deserialize.options b/projects/skia/region_deserialize.options deleted file mode 100644 index 14b7dbfea..000000000 --- a/projects/skia/region_deserialize.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 512 \ No newline at end of file diff --git a/projects/skia/region_set_path.options b/projects/skia/region_set_path.options deleted file mode 100644 index 14b7dbfea..000000000 --- a/projects/skia/region_set_path.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 512 \ No newline at end of file diff --git a/projects/skia/skdescriptor_deserialize.options b/projects/skia/skdescriptor_deserialize.options deleted file mode 100644 index 0090e8be5..000000000 --- a/projects/skia/skdescriptor_deserialize.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 1024 \ No newline at end of file diff --git a/projects/skia/sksl.options b/projects/skia/sksl.options deleted file mode 100644 index 648edd482..000000000 --- a/projects/skia/sksl.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 3000 \ No newline at end of file diff --git a/projects/skia/textblob_deserialize.options b/projects/skia/textblob_deserialize.options deleted file mode 100644 index 0090e8be5..000000000 --- a/projects/skia/textblob_deserialize.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -max_len = 1024 \ No newline at end of file