From e35e098da14dfe33876fac8d6a96d9589d174026 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Thu, 9 Jan 2025 15:28:43 +0100 Subject: [PATCH 1/2] opencv: add libgif-dev as build dependency This will help fuzz more inputs --- projects/opencv/Dockerfile | 2 +- projects/opencv/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/opencv/Dockerfile b/projects/opencv/Dockerfile index a6b885df7adb..6df8ff478b36 100644 --- a/projects/opencv/Dockerfile +++ b/projects/opencv/Dockerfile @@ -16,7 +16,7 @@ FROM gcr.io/oss-fuzz-base/base-builder -RUN apt-get update && apt-get install -y build-essential cmake pkg-config +RUN apt-get update && apt-get install -y build-essential cmake libgif-dev pkg-config RUN git clone --depth 1 https://github.com/opencv/opencv.git opencv WORKDIR opencv/ diff --git a/projects/opencv/build.sh b/projects/opencv/build.sh index c5db8d6f8d4c..3b452532b0af 100755 --- a/projects/opencv/build.sh +++ b/projects/opencv/build.sh @@ -24,7 +24,7 @@ cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=$install_dir \ -DBUILD_SHARED_LIBS=OFF -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_GENERATE_PKGCONFIG=ON -DOPENCV_FORCE_3RDPARTY_BUILD=ON \ -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_opencv_apps=OFF \ - $SRC/opencv + -DWITH_IMGCODEC_GIF=ON $SRC/opencv make -j$(nproc) make install popd @@ -40,7 +40,7 @@ $CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.cc -std=c++11 \ -lopencv_dnn -lopencv_objdetect -lopencv_photo -lopencv_ml -lopencv_gapi \ -lopencv_stitching -lopencv_video -lopencv_calib3d -lopencv_features2d \ -lopencv_highgui -lopencv_videoio -lopencv_imgcodecs -lopencv_imgproc \ --lopencv_flann -lopencv_core -llibjpeg-turbo -llibwebp -llibpng -llibtiff \ +-lopencv_flann -lopencv_core -lgif -llibjpeg-turbo -llibwebp -llibpng -llibtiff \ -llibopenjp2 -lIlmImf -llibprotobuf -lzlib -littnotify -lippiw \ -lippicv -lade -ldl -lm -lpthread -lrt \ -o $OUT/$fuzzer From ebf0e6da77865a54a3f0c4213a2acfa18f333479 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Thu, 9 Jan 2025 16:17:34 +0100 Subject: [PATCH 2/2] Do not install libgif-dev, we have native support. --- projects/opencv/Dockerfile | 2 +- projects/opencv/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/opencv/Dockerfile b/projects/opencv/Dockerfile index 6df8ff478b36..a6b885df7adb 100644 --- a/projects/opencv/Dockerfile +++ b/projects/opencv/Dockerfile @@ -16,7 +16,7 @@ FROM gcr.io/oss-fuzz-base/base-builder -RUN apt-get update && apt-get install -y build-essential cmake libgif-dev pkg-config +RUN apt-get update && apt-get install -y build-essential cmake pkg-config RUN git clone --depth 1 https://github.com/opencv/opencv.git opencv WORKDIR opencv/ diff --git a/projects/opencv/build.sh b/projects/opencv/build.sh index 3b452532b0af..f6075c5d2e16 100755 --- a/projects/opencv/build.sh +++ b/projects/opencv/build.sh @@ -40,7 +40,7 @@ $CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.cc -std=c++11 \ -lopencv_dnn -lopencv_objdetect -lopencv_photo -lopencv_ml -lopencv_gapi \ -lopencv_stitching -lopencv_video -lopencv_calib3d -lopencv_features2d \ -lopencv_highgui -lopencv_videoio -lopencv_imgcodecs -lopencv_imgproc \ --lopencv_flann -lopencv_core -lgif -llibjpeg-turbo -llibwebp -llibpng -llibtiff \ +-lopencv_flann -lopencv_core -llibjpeg-turbo -llibwebp -llibpng -llibtiff \ -llibopenjp2 -lIlmImf -llibprotobuf -lzlib -littnotify -lippiw \ -lippicv -lade -ldl -lm -lpthread -lrt \ -o $OUT/$fuzzer