Skip to content

Commit

Permalink
Do not export env variables, just assign to them. (#2044)
Browse files Browse the repository at this point in the history
Have DAV1D_EXTRA_FLAGS and EXTRA_CMAKE_FLAGS be normal non-environment variables.

BUG=oss-fuzz:67122
  • Loading branch information
vrabaud authored Feb 29, 2024
1 parent cdb1c3d commit 69aba54
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tests/oss-fuzz/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ set -eu

# Build dav1d with sanitizer flags.
# Adds extra flags: -Db_sanitize=$SANITIZER -Db_lundef=false, and -Denable_asm=false for msan
DAV1D_EXTRA_FLAGS=""

This comment has been minimized.

Copy link
@wantehchang

wantehchang Feb 29, 2024

Collaborator

It turns out that this line (alwas set the DAV1D_EXTRA_FLAGS variable) is the key to fixing the build failure in https://crbug.com/oss-fuzz/67122. It would have been good for the commit message to describe this change.

if [ "$SANITIZER" != "coverage" ] && [ "$SANITIZER" != "introspector" ]
then
export DAV1D_EXTRA_FLAGS="-Db_sanitize=$SANITIZER -Db_lundef=false"
DAV1D_EXTRA_FLAGS="${DAV1D_EXTRA_FLAGS} -Db_sanitize=$SANITIZER -Db_lundef=false"
fi
if [ "$SANITIZER" == "memory" ]
then
export DAV1D_EXTRA_FLAGS="${DAV1D_EXTRA_FLAGS} -Denable_asm=false"
DAV1D_EXTRA_FLAGS="${DAV1D_EXTRA_FLAGS} -Denable_asm=false"
fi
sed -i 's/meson setup \(.*\) \.\./meson setup \1 '"${DAV1D_EXTRA_FLAGS}"' ../g' ./ext/dav1d.cmd

Expand All @@ -71,12 +72,11 @@ cd ext && bash aom.cmd && bash dav1d.cmd && bash fuzztest.cmd && bash libjpeg.cm
# build libavif
mkdir build
cd build
EXTRA_CMAKE_FLAGS=""
if [ "$FUZZING_ENGINE" == "libfuzzer" ]
then
export CXXFLAGS="${CXXFLAGS} -DFUZZTEST_COMPATIBILITY_MODE"
export EXTRA_CMAKE_FLAGS="-DAVIF_ENABLE_FUZZTEST=ON -DFUZZTEST_COMPATIBILITY_MODE=libfuzzer"
else
export EXTRA_CMAKE_FLAGS=""
CXXFLAGS="${CXXFLAGS} -DFUZZTEST_COMPATIBILITY_MODE"
EXTRA_CMAKE_FLAGS="${EXTRA_CMAKE_FLAGS} -DAVIF_ENABLE_FUZZTEST=ON -DFUZZTEST_COMPATIBILITY_MODE=libfuzzer"
fi
cmake .. -G Ninja -DBUILD_SHARED_LIBS=OFF -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL \
-DAVIF_CODEC_AOM_DECODE=ON -DAVIF_CODEC_AOM_ENCODE=ON \
Expand Down

0 comments on commit 69aba54

Please sign in to comment.