[libtiff] move libtiff build scripts and fuzzers to the libtiff repo (#1317) (#1325)

2 files changed, 1 insertions, 97 deletions

diff --git a/projects/libtiff/build.sh b/projects/libtiff/build.sh
index 487b4572c..088951579 100755
--- a/projects/libtiff/build.sh
+++ b/projects/libtiff/build.sh
@@ -15,33 +15,4 @@
 #
 ################################################################################
 
-
-# build zlib
-pushd "$SRC/zlib"
-./configure --static --prefix="$WORK"
-make -j$(nproc) CFLAGS="$CFLAGS -fPIC"
-make install
-popd
-
-# Build libjpeg-turbo
-pushd "$SRC/libjpeg-turbo"
-cmake . -DCMAKE_INSTALL_PREFIX=$WORK -DENABLE_STATIC=on -DENABLE_SHARED=off
-make -j$(nproc)
-make install
-popd
-
-cmake . -DCMAKE_INSTALL_PREFIX=$WORK -DBUILD_SHARED_LIBS=off
-make -j$(nproc)
-make install
-
-$CXX $CXXFLAGS -std=c++11 -I$WORK/include \
-    $SRC/tiff_read_rgba_fuzzer.cc -o $OUT/tiff_read_rgba_fuzzer \
-    -lFuzzingEngine $WORK/lib/libtiffxx.a $WORK/lib/libtiff.a $WORK/lib/libz.a $WORK/lib/libjpeg.a
-
-mkdir afl_testcases
-(cd afl_testcases; tar xf "$SRC/afl_testcases.tgz")
-mkdir tif
-find afl_testcases -type f -name '*.tif' -exec mv -n {} tif/ \;
-zip -rj tif.zip tif/
-cp tif.zip "$OUT/tiff_read_rgba_fuzzer_seed_corpus.zip"
-cp "$SRC/tiff.dict" "$OUT/tiff_read_rgba_fuzzer.dict"
+. contrib/oss-fuzz/build.sh
diff --git a/projects/libtiff/tiff_read_rgba_fuzzer.cc b/projects/libtiff/tiff_read_rgba_fuzzer.cc
deleted file mode 100644
index e19481f4e..000000000
--- a/projects/libtiff/tiff_read_rgba_fuzzer.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <cstdint>
-#include <sstream>
-#include <tiffio.h>
-#include <tiffio.hxx>
-
-
-/* stolen from tiffiop.h, which is a private header so we can't just include it */
-/* safe multiply returns either the multiplied value or 0 if it overflowed */
-#define __TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
-
-const tmsize_t MAX_SIZE = 500000000;
-
-extern "C" void handle_error(const char *unused, const char *unused2, va_list unused3) {
-    return;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-  TIFFSetErrorHandler(handle_error);
-  TIFFSetWarningHandler(handle_error);
-  std::istringstream s(std::string(Data,Data+Size));
-  TIFF* tif = TIFFStreamOpen("MemTIFF", &s);
-  if (!tif) {
-      return 0;
-  }
-  uint32 w, h;
-  size_t npixels;
-  uint32* raster;
-
-  TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &w);
-  TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &h);
-  /* don't continue if image has negative size or the file size is ludicrous */
-  if (TIFFTileSize(tif) > MAX_SIZE || w <=0 || h <= 0) {
-      TIFFClose(tif);
-      return 0;
-  }
-  tmsize_t bufsize = __TIFFSafeMultiply(tmsize_t, TIFFTileSize(tif), 4);
-  /* don't continue if the buffer size greater than the max allowed by the fuzzer */
-  if (bufsize > MAX_SIZE || bufsize == 0) {
-      TIFFClose(tif);
-      return 0;
-  }
-  /* another hack to work around an OOM in tif_fax3.c */
-  uint32 tilewidth = 0;
-  uint32 imagewidth = 0;
-  TIFFGetField(tif, TIFFTAG_TILEWIDTH, &tilewidth);
-  TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &imagewidth);
-  tilewidth = __TIFFSafeMultiply(uint32, tilewidth, 2);
-  imagewidth = __TIFFSafeMultiply(uint32, imagewidth, 2);
-  if (tilewidth * 2 > MAX_SIZE || imagewidth * 2 > MAX_SIZE || tilewidth == 0 || imagewidth == 0) {
-      TIFFClose(tif);
-      return 0;
-  }
-  npixels = w * h;
-  uint32 size = __TIFFSafeMultiply(uint32, w, h);
-  if (size > MAX_SIZE || size == 0) {
-      TIFFClose(tif);
-      return 0;
-  }
-  raster = (uint32*) _TIFFmalloc(npixels * sizeof (uint32));
-  if (raster != NULL) {
-      TIFFReadRGBAImage(tif, w, h, raster, 0);
-      _TIFFfree(raster);
-  }
-  TIFFClose(tif);
-
-  return 0;
-}