Merge branch 'master' into master

Author: hadipra5

projects/gpac/build.sh

@@ -35,4 +35,10 @@ for f in $fuzzers; do
         zip -j $OUT/${fuzzerName}_seed_corpus.zip $SRC/gpac/testsuite/oss-fuzzers/${fuzzerName}_corpus/*
     fi
 
-done
+    if [ -f "$SRC/gpac/testsuite/oss-fuzzers/${fuzzerName}.dict" ]; then
+        cp $SRC/gpac/testsuite/oss-fuzzers/${fuzzerName}.dict $OUT/
+    fi
+    if [ -f "$SRC/gpac/testsuite/oss-fuzzers/${fuzzerName}.options" ]; then
+        cp $SRC/gpac/testsuite/oss-fuzzers/${fuzzerName}.options $OUT/
+    fi
+done

projects/harfbuzz/Dockerfile

@@ -16,6 +16,7 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y python3-pip ragel pkg-config zlib1g-dev:i386 && \
+    pip3 install --upgrade pip && \
     pip3 install meson==1.2.0 ninja
 RUN git clone --depth 1 https://github.com/harfbuzz/harfbuzz.git
 WORKDIR harfbuzz

projects/harfbuzz/build.sh

@@ -44,7 +44,7 @@ ninja -v -j$(nproc) -C $build test/fuzzing/hb-{shape,raster,vector,gpu,subset,re
 mv $build/test/fuzzing/hb-{shape,raster,vector,gpu,subset,repacker}-fuzzer $OUT/
 
 # Archive and copy to $OUT seed corpus if the build succeeded.
-mkdir all-fonts
+mkdir -p all-fonts
 for d in \
 	test/shape/data/in-house/fonts \
 	test/shape/data/aots/fonts \

projects/powerdns/build.sh

@@ -83,7 +83,7 @@ if [ -f dnsdistdist/fuzz_dnsdistcache.cc ]; then
           ${build_dir}
         meson compile -C ${build_dir} fuzz-targets
         # copy the fuzzing target binaries
-        cp ${build_dir}/fuzz-target-* "${OUT}/"
+        find ${build_dir} -type f -executable -name 'fuzz-target-*' -exec cp {} ${OUT}/ \;
     fi
 
     # back to the pdns/ directory

projects/python3-libraries/build.sh

@@ -90,7 +90,6 @@ zip -j $OUT/fuzzer-csv_seed_corpus.zip corp-csv/*
 cp $SRC/library-fuzzers/fuzzer-decode $OUT/
 cp $SRC/library-fuzzers/decode.py $OUT/
 zip -j $OUT/fuzzer-decode_seed_corpus.zip corp-decode/*
-cp $SRC/library-fuzzers/fuzzer-decode.dict $OUT/
 
 cp $SRC/library-fuzzers/fuzzer-ast $OUT/
 cp $SRC/library-fuzzers/ast.py $OUT/

projects/vlc/build.sh

@@ -54,6 +54,11 @@ cd ../../
 # Resume instrumentation
 export CFLAGS="${CFLAGS_SAVE}"
 export CXXFLAGS="${CXXFLAGS_SAVE}"
+# Disable asserts under ASAN to let the fuzzer find deeper bugs past debug checks
+if [ "$SANITIZER" = "address" ]; then
+    export CFLAGS="$CFLAGS -DNDEBUG"
+    export CXXFLAGS="$CXXFLAGS -DNDEBUG"
+fi
 unset AFL_NOOPT
 
 # Use OSS-Fuzz environment rather than hardcoded setup.