From 051dcaf877600438a594887ae24645d3cc421ca1 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 8 Sep 2017 08:18:34 -0500 Subject: [PATCH] [libpng16] Added a copy of Dockerfile to the contrib/oss-fuzz directory --- contrib/oss-fuzz/Dockerfile | 24 ++++++++++++++++++++++++ contrib/oss-fuzz/README.txt | 9 +++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 contrib/oss-fuzz/Dockerfile diff --git a/contrib/oss-fuzz/Dockerfile b/contrib/oss-fuzz/Dockerfile new file mode 100644 index 000000000..7e4d1ebff --- /dev/null +++ b/contrib/oss-fuzz/Dockerfile @@ -0,0 +1,24 @@ +# Copyright 2016 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +################################################################################ + +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 git clone --depth 1 https://github.com/glennrp/libpng.git +RUN (cd libpng; git log | head -1) +WORKDIR libpng +COPY build.sh $SRC/ diff --git a/contrib/oss-fuzz/README.txt b/contrib/oss-fuzz/README.txt index 795c9aa03..cb7fb13ff 100644 --- a/contrib/oss-fuzz/README.txt +++ b/contrib/oss-fuzz/README.txt @@ -1,4 +1,4 @@ -Last changed in libpng 1.6.32 [August 24, 2017] +Last changed in libpng 1.6.33 [(PENDING RELEASE)] Copyright (c) 2017 Glenn Randers-Pehrson This code is released under the libpng license. @@ -23,14 +23,15 @@ The files are Original Filename or derived Copyright License ========================= ========== ================ ========== + Dockerfile* 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 - * build.sh is a copy of the file used by oss-fuzz. png.dict and - libpng_read_fuzzer.* are the actual files used by oss-fuzz, which - retrieves them from the libpng repository at Github. + * Dockerfile and build.sh are copies of the files used by oss-fuzz. + png.dict and libpng_read_fuzzer.* are the actual files used by oss-fuzz, + which retrieves them from the libpng repository at Github. To do: exercise the progressive reader and the png encoder.