averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-06-12 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't link the fuzzing engine while compiling encoder_list (#1707)

Browse Source
This commit is contained in:
Alex Gaynor
2019-09-29 10:33:35 -04:00
committed by ImageMagick
parent a5041aca3a
commit 4d0cb28ff3
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/build_fuzzers.sh
+2 -1
View File
@@ -5,9 +5,10 @@ MAGICK_COMPILER_FLAGS="-DBUILD_TRAVIS=1"
MAGICK_INCLUDE="appdir/usr/include/ImageMagick-7"
MAGICK_SRC="Magick++/fuzz"
MAGICK_LIBS="-Lappdir/usr/lib -lz -lpng -lfontconfig -lxcb -lX11 -lXext -lbz2 -ljpeg -ljbig -lIlmImf -ldjvulibre -ltiff -llqr-1 -lwmf -lwmflite -lraqm -lxml2 -llzma -llcms2 -lpthread -lfreetype -lMagick++-7.Q16 -lMagickWand-7.Q16 -lMagickCore-7.Q16 -lstdc++"
MAGICK_LIBS_NO_FUZZ="$MAGICK_LIBS"
MAGICK_OUTPUT="Magick++/fuzz"
MAGICK_FAST_BUILD=1
export LD_LIBRARY_PATH=appdir/usr/lib
. $MAGICK_SRC/build_fuzzers.sh
. $MAGICK_SRC/build_fuzzers.sh
Magick++/fuzz/build.sh
+2 -1
View File
@@ -102,7 +102,8 @@ MAGICK_COMPILER=$CXX
MAGICK_COMPILER_FLAGS=$CXXFLAGS
MAGICK_INCLUDE="$WORK/include/ImageMagick-7"
MAGICK_SRC="$SRC/imagemagick/Magick++/fuzz"
MAGICK_LIBS="$LIB_FUZZING_ENGINE $WORK/lib/libMagick++-7.Q16HDRI.a $WORK/lib/libMagickWand-7.Q16HDRI.a $WORK/lib/libMagickCore-7.Q16HDRI.a $WORK/lib/libpng.a $WORK/lib/libtiff.a $WORK/lib/libheif.a $WORK/lib/libde265.a $WORK/lib/libopenjp2.a $WORK/lib/libwebp.a $WORK/lib/libturbojpeg.a $WORK/lib/libjpeg.a $WORK/lib/libfreetype.a $WORK/lib/libraw.a $WORK/lib/liblzma.a $WORK/lib/liblcms2.a $WORK/lib/libz.a"
MAGICK_LIBS_NO_FUZZ="$WORK/lib/libMagick++-7.Q16HDRI.a $WORK/lib/libMagickWand-7.Q16HDRI.a $WORK/lib/libMagickCore-7.Q16HDRI.a $WORK/lib/libpng.a $WORK/lib/libtiff.a $WORK/lib/libheif.a $WORK/lib/libde265.a $WORK/lib/libopenjp2.a $WORK/lib/libwebp.a $WORK/lib/libturbojpeg.a $WORK/lib/libjpeg.a $WORK/lib/libfreetype.a $WORK/lib/libraw.a $WORK/lib/liblzma.a $WORK/lib/liblcms2.a $WORK/lib/libz.a"
MAGICK_LIBS="$LIB_FUZZING_ENGINE $MAGICK_LIBS_NO_FUZZ"
MAGICK_OUTPUT=$OUT
MAGICK_FAST_BUILD=0
Magick++/fuzz/build_fuzzers.sh
+1 -1
View File
@@ -3,7 +3,7 @@
MAGICK_COMPILER_FLAGS="$MAGICK_COMPILER_FLAGS -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"
$MAGICK_COMPILER $MAGICK_COMPILER_FLAGS -std=c++11 -I$MAGICK_INCLUDE "$MAGICK_SRC/encoder_list.cc" \
-o "$MAGICK_SRC/encoder_list" $MAGICK_LIBS
-o "$MAGICK_SRC/encoder_list" $MAGICK_LIBS_NO_FUZZ
for f in $MAGICK_SRC/*_fuzzer.cc; do
fuzzer=$(basename "$f" _fuzzer.cc)