[flac] Simplify build script (#9773)

A number of fuzzer names to be copied is removed from the build script.
The naming of various files in FLACs oss-fuzz directory has been changed
so all files that belong in $OUT have the same prefix.

Also, some defaults have changed because of this ticket:
https://github.com/xiph/flac/issues/546 Other projects relying on
libFLAC being fuzzed can now rely on default settings.
This commit is contained in:
Martijn van Beurden 2023-02-21 19:22:06 +01:00 committed by GitHub
parent ad2de3e7c0
commit 4a5ea89566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions

View File

@ -49,22 +49,21 @@ else
fi
make -j$(nproc)
# Copy encoder fuzzers
cd $SRC/flac/oss-fuzz
cp fuzzer_encoder fuzzer_encoder_v2 $OUT
# Build libflac again for decoder fuzzers, but now with additional define
cd $SRC/flac/
echo "#define FUZZING_BUILD_MODE_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW" >> config.h
make -j$(nproc)
# Copy decoder fuzzers
cd $SRC/flac/oss-fuzz
cp fuzzer_decoder fuzzer_seek fuzzer_metadata fuzzer_reencoder $OUT
cp fuzzer_*.dict $OUT
cp fuzzer_* $OUT
cd $SRC
# Build fuzzer_exo
$CXX $CXXFLAGS -I $SRC/flac/oss-fuzz/ -I $SRC/flac/include/ -I $SRC/ExoPlayer/extensions/flac/src/main/jni/ -I /usr/lib/jvm/java-11-openjdk-amd64/include/ -I /usr/lib/jvm/java-11-openjdk-amd64/include/linux/ fuzzer_exo.cpp \
$SRC/flac/src/libFLAC++/.libs/libFLAC++.a $SRC/flac/src/libFLAC/.libs/libFLAC.a $SRC/libogg-install/lib/libogg.a $LIB_FUZZING_ENGINE -o $OUT/fuzzer_exo
# Build libflac again for encoder fuzzers, but now with additional define
cd $SRC/flac/
echo "#define FUZZING_BUILD_MODE_FLAC_SANITIZE_SIGNED_INTEGER_OVERFLOW" >> config.h
make -j$(nproc)
# Copy encoder fuzzers
cd $SRC/flac/oss-fuzz
cp fuzzer_encoder fuzzer_encoder_v2 $OUT

View File

@ -25,7 +25,7 @@
#include <cstdlib>
#include <cstring>
#include "fuzzer_common.h"
#include "common.h"
#define LOG_TAG "FLACParser"