diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2017-09-24 08:31:08 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2017-09-24 08:31:08 -0500 |
| commit | 8eb79b3435086935ec64aae74c5c730d75617979 (patch) | |
| tree | 3cdb5721ac6ed9b5960328d82514c3af8daf8333 | |
| parent | 13a158690ffb8378b4987aef26fcd7a791831601 (diff) | |
| download | libpng-8eb79b3435086935ec64aae74c5c730d75617979.tar.gz | |
[libpng16] Undo faulty attempt to defeat the fuzzer optimizer
| -rw-r--r-- | contrib/oss-fuzz/libpng_read_fuzzer.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/contrib/oss-fuzz/libpng_read_fuzzer.cc b/contrib/oss-fuzz/libpng_read_fuzzer.cc index efd8cf16a..12208f402 100644 --- a/contrib/oss-fuzz/libpng_read_fuzzer.cc +++ b/contrib/oss-fuzz/libpng_read_fuzzer.cc @@ -5,7 +5,7 @@ // Use of this source code is governed by a BSD-style license that may // be found in the LICENSE file https://cs.chromium.org/chromium/src/LICENSE -// Last changed in libpng 1.6.33beta03 [September 23, 2017] +// Last changed in libpng 1.6.33beta03 [September 24, 2017] // The modifications in 2017 by Glenn Randers-Pehrson include // 1. addition of a PNG_CLEANUP macro, @@ -169,21 +169,14 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { int passes = png_set_interlace_handling(png_handler.png_ptr); png_start_read_image(png_handler.png_ptr); - int max_filter = 0; + /* To do: prevent the optimizer from removing this code entirely */ for (int pass = 0; pass < passes; ++pass) { for (png_uint_32 y = 0; y < height; ++y) { png_read_row(png_handler.png_ptr, static_cast<png_bytep>(png_handler.row_ptr), nullptr); - max_filter = png_handler.row_buf[0] > max_filter ? - png_handler.row_buf[0] : max_filter; } } - if (max_filter > 5) { - PNG_CLEANUP - return 0; - } - png_read_end(png_handler.png_ptr, png_handler.end_info_ptr); PNG_CLEANUP |