summaryrefslogtreecommitdiff
path: root/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-07-16 23:33:39 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-07-16 23:33:39 +0000
commitbb3faa4d6bfce9baecc84539f560d8e518228e04 (patch)
tree2a458af9d27cd5c42b4f8de471eaeabbb1fb1e1a /Build/source/libs/libpng/libpng-src/contrib/oss-fuzz
parent4712a2a4209de069ba87751cf2a4043fc459a8cf (diff)
libpng 1.6.35
git-svn-id: svn://tug.org/texlive/trunk@48212 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng/libpng-src/contrib/oss-fuzz')
-rw-r--r--Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile7
-rw-r--r--Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt4
-rwxr-xr-xBuild/source/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh11
-rw-r--r--Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc24
-rw-r--r--Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/newcc190
5 files changed, 29 insertions, 207 deletions
diff --git a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile
index 7e4d1ebff2c..f5bc1a985d3 100644
--- a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile
+++ b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/Dockerfile
@@ -16,9 +16,10 @@
FROM gcr.io/oss-fuzz-base/base-builder
MAINTAINER glennrp@gmail.com
-RUN apt-get update && apt-get install -y make autoconf automake libtool zlib1g-dev
+RUN apt-get update && \
+ apt-get install -y make autoconf automake libtool
+RUN git clone --depth 1 https://github.com/madler/zlib.git
RUN git clone --depth 1 https://github.com/glennrp/libpng.git
-RUN (cd libpng; git log | head -1)
+RUN cp libpng/contrib/oss-fuzz/build.sh $SRC
WORKDIR libpng
-COPY build.sh $SRC/
diff --git a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt
index a2b67366584..3b3656fbb60 100644
--- a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt
+++ b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/README.txt
@@ -24,13 +24,13 @@ The files are
Filename or derived Copyright License
========================= ========== ================ ==========
Dockerfile* derived 2017, Glenn R-P Apache 2.0
- build.sh* derived 2017, Glenn R-P Apache 2.0
+ build.sh derived 2017, Glenn R-P Apache 2.0
libpng_read_fuzzer.cc derived 2017, Glenn R-P Chromium
libpng_read_fuzzer.options original 2015, Chrome Devs Chromium
png.dict original 2015, Chrome Devs Chromium
README.txt (this file) original 2017, Glenn R-P libpng
- * Dockerfile and build.sh are copies of the files used by oss-fuzz.
+ * Dockerfile is a copy of the file used by oss-fuzz. build.sh,
png.dict and libpng_read_fuzzer.* are the actual files used by oss-fuzz,
which retrieves them from the libpng repository at Github.
diff --git a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh
index d2137b13e70..f9e1b0776d0 100755
--- a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh
+++ b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/build.sh
@@ -1,5 +1,5 @@
#!/bin/bash -eu
-# Copyright 2017 Glenn Randers-Pehrson
+# Copyright 2017-2018 Glenn Randers-Pehrson
# Copyright 2016 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +14,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# Last changed in libpng 1.6.33 [September 28, 2017]
+# Last changed in libpng 1.6.35 [July 15, 2018]
#
-# Revisions by Glenn Randers-Pehson, 2017:
+# Revisions by Glenn Randers-Pehrson, 2017:
# 1. Build only the library, not the tools (changed "make -j$(nproc) all" to
# "make -j$(nproc) libpng16.la").
# 2. Disabled WARNING and WRITE options in pnglibconf.dfa.
+# 3. Build zlib alongside libpng
################################################################################
# Disable logging via library build configuration control.
@@ -30,9 +31,9 @@ cat scripts/pnglibconf.dfa | \
> scripts/pnglibconf.dfa.temp
mv scripts/pnglibconf.dfa.temp scripts/pnglibconf.dfa
-# build the library.
+# build the libpng library.
autoreconf -f -i
-./configure
+./configure --with-libpng-prefix=OSS_FUZZ_
make -j$(nproc) clean
make -j$(nproc) libpng16.la
diff --git a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
index 78c7c9ff096..7b305509cde 100644
--- a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
+++ b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
@@ -1,11 +1,11 @@
// libpng_read_fuzzer.cc
-// Copyright 2017 Glenn Randers-Pehrson
+// Copyright 2017-2018 Glenn Randers-Pehrson
// Copyright 2015 The Chromium Authors. All rights reserved.
// 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.32 [August 24, 2017]
+// Last changed in libpng 1.6.35 [July 15, 2018]
// The modifications in 2017 by Glenn Randers-Pehrson include
// 1. addition of a PNG_CLEANUP macro,
@@ -13,6 +13,7 @@
// 3. adding "#include <string.h>" which is needed on some platforms
// to provide memcpy().
// 4. adding read_end_info() and creating an end_info structure.
+// 5. adding calls to png_set_*() transforms commonly used by browsers.
#include <stddef.h>
#include <stdint.h>
@@ -67,7 +68,7 @@ struct PngObjectHandler {
}
};
-void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
+void user_read_data(png_structp png_ptr, png_bytep data, size_t length) {
BufState* buf_state = static_cast<BufState*>(png_get_io_ptr(png_ptr));
if (length > buf_state->bytes_left) {
png_error(png_ptr, "read error");
@@ -136,9 +137,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
// Reading.
png_read_info(png_handler.png_ptr, png_handler.info_ptr);
- png_handler.row_ptr = png_malloc(
- png_handler.png_ptr, png_get_rowbytes(png_handler.png_ptr,
- png_handler.info_ptr));
// reset error handler to put png_deleter into scope.
if (setjmp(png_jmpbuf(png_handler.png_ptr))) {
@@ -163,8 +161,20 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
return 0;
}
+ // Set several transforms that browsers typically use:
+ png_set_gray_to_rgb(png_handler.png_ptr);
+ png_set_expand(png_handler.png_ptr);
+ png_set_packing(png_handler.png_ptr);
+ png_set_scale_16(png_handler.png_ptr);
+ png_set_tRNS_to_alpha(png_handler.png_ptr);
+
int passes = png_set_interlace_handling(png_handler.png_ptr);
- png_start_read_image(png_handler.png_ptr);
+
+ png_read_update_info(png_handler.png_ptr, png_handler.info_ptr);
+
+ png_handler.row_ptr = png_malloc(
+ png_handler.png_ptr, png_get_rowbytes(png_handler.png_ptr,
+ png_handler.info_ptr));
for (int pass = 0; pass < passes; ++pass) {
for (png_uint_32 y = 0; y < height; ++y) {
diff --git a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/newcc b/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/newcc
deleted file mode 100644
index 0fc9e206c21..00000000000
--- a/Build/source/libs/libpng/libpng-src/contrib/oss-fuzz/newcc
+++ /dev/null
@@ -1,190 +0,0 @@
-
-// libpng_read_fuzzer.cc
-// Copyright 2017 Glenn Randers-Pehrson
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// 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 27, 2017]
-
-// The modifications in 2017 by Glenn Randers-Pehrson include
-// 1. addition of a PNG_CLEANUP macro,
-// 2. setting the option to ignore ADLER32 checksums,
-// 3. adding "#include <string.h>" which is needed on some platforms
-// to provide memcpy().
-// 4. adding read_end_info() and creating an end_info structure.
-
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <vector>
-
-#define PNG_INTERNAL
-#include "png.h"
-
-struct BufState {
- const uint8_t* data;
- size_t bytes_left;
-};
-
-struct PngObjectHandler {
- png_infop info_ptr = nullptr;
- png_structp png_ptr = nullptr;
- png_infop end_info_ptr = nullptr;
- png_voidp row_ptr = nullptr;
- BufState* buf_state = nullptr;
-
- ~PngObjectHandler() {
- if (row_ptr)
- png_free(png_ptr, row_ptr);
- if (end_info_ptr)
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info_ptr);
- else if (info_ptr)
- png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
- else
- png_destroy_read_struct(&png_ptr, nullptr, nullptr);
- delete buf_state;
- }
-};
-
-void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
- BufState* buf_state = static_cast<BufState*>(png_get_io_ptr(png_ptr));
- if (length > buf_state->bytes_left) {
- png_error(png_ptr, "read error");
- }
- memcpy(data, buf_state->data, length);
- buf_state->bytes_left -= length;
- buf_state->data += length;
-}
-
-static const int kPngHeaderSize = 8;
-
-// Entry point for LibFuzzer.
-// Roughly follows the libpng book example:
-// http://www.libpng.org/pub/png/book/chapter13.html
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- if (size < kPngHeaderSize) {
- return 0;
- }
-
- std::vector<unsigned char> v(data, data + size);
- if (png_sig_cmp(v.data(), 0, kPngHeaderSize)) {
- // not a PNG.
- return 0;
- }
-
- PngObjectHandler png_handler;
- png_handler.png_ptr = nullptr;
- png_handler.row_ptr = nullptr;
- png_handler.info_ptr = nullptr;
- png_handler.end_info_ptr = nullptr;
-
- png_handler.png_ptr = png_create_read_struct
- (PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
- if (!png_handler.png_ptr) {
- return 0;
- }
-
-#define PNG_CLEANUP \
- if(png_handler.png_ptr) \
- { \
- if (png_handler.row_ptr) \
- png_free(png_handler.png_ptr, png_handler.row_ptr); \
- if (png_handler.end_info_ptr) \
- png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr,\
- &png_handler.end_info_ptr); \
- else if (png_handler.info_ptr) \
- png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr,\
- nullptr); \
- else \
- png_destroy_read_struct(&png_handler.png_ptr, nullptr, nullptr); \
- png_handler.png_ptr = nullptr; \
- png_handler.row_ptr = nullptr; \
- png_handler.info_ptr = nullptr; \
- png_handler.end_info_ptr = nullptr; \
- }
-
- png_handler.info_ptr = png_create_info_struct(png_handler.png_ptr);
- if (!png_handler.info_ptr) {
- PNG_CLEANUP
- return 0;
- }
-
- png_handler.end_info_ptr = png_create_info_struct(png_handler.png_ptr);
- if (!png_handler.end_info_ptr) {
- PNG_CLEANUP
- return 0;
- }
-
- /* Treat benign errors as warnings */
- png_set_benign_errors(png_handler.png_ptr, 1);
-
- png_set_crc_action(png_handler.png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
-
-#ifdef PNG_IGNORE_ADLER32
- png_set_option(png_handler.png_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON);
-#endif
-
- // Setting up reading from buffer.
- png_handler.buf_state = new BufState();
- png_handler.buf_state->data = data + kPngHeaderSize;
- png_handler.buf_state->bytes_left = size - kPngHeaderSize;
- png_set_read_fn(png_handler.png_ptr, png_handler.buf_state, user_read_data);
- png_set_sig_bytes(png_handler.png_ptr, kPngHeaderSize);
-
- if (setjmp(png_jmpbuf(png_handler.png_ptr))) {
- PNG_CLEANUP
- return 0;
- }
-
- // Reading.
- png_read_info(png_handler.png_ptr, png_handler.info_ptr);
- png_read_update_info(png_handler.png_ptr, png_handler.info_ptr);
- png_handler.row_ptr = png_malloc(
- png_handler.png_ptr, png_get_rowbytes(png_handler.png_ptr,
- png_handler.info_ptr));
-
- // reset error handler to put png_deleter into scope.
- if (setjmp(png_jmpbuf(png_handler.png_ptr))) {
- PNG_CLEANUP
- return 0;
- }
-
- png_uint_32 width, height;
- int bit_depth, color_type, interlace_type, compression_type;
- int filter_type;
-
- if (!png_get_IHDR(png_handler.png_ptr, png_handler.info_ptr, &width,
- &height, &bit_depth, &color_type, &interlace_type,
- &compression_type, &filter_type)) {
- PNG_CLEANUP
- return 0;
- }
-
- // This is going to be too slow.
- if (width && height > 100000000 / width) {
- PNG_CLEANUP
- return 0;
- }
-
- int passes = png_set_interlace_handling(png_handler.png_ptr);
- png_start_read_image(png_handler.png_ptr);
-
- /* 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);
- }
- }
-
- png_read_end(png_handler.png_ptr, png_handler.end_info_ptr);
-
- PNG_CLEANUP
-
- /* TO do: exercise the progressive reader here */
-
- return 0;
-}