diff options
| author | Bitshift <puddles@google.com> | 2021-08-16 10:56:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 08:56:54 -0700 |
| commit | 55a5812e8c53bf93bbf6000f3e0d0f168d164d1f (patch) | |
| tree | 5101c2caeb7c435f4cddba5c8198c9e5a98a7dc5 /infra/base-images | |
| parent | 926914100cfde1926ba30c3e3a1b8f305b9b7d03 (diff) | |
| download | oss-fuzz-55a5812e8c53bf93bbf6000f3e0d0f168d164d1f.tar.gz | |
Update fuzzers to new Atheris version (#6060)
* Update fuzzers to new Atheris version
* Pin new atheris version
* Change = to ==
* Change path where Atheris fuzzers ld_preload from
* Update hypothesis fuzzer to work with new atheris
* Set version to 2.0.1
* Switch to Atheris 2.0.4
* Correct spelling of pygments_fuzzer decorator
* instrument yaml_reader
* Change to latest Atheris
* Set atheris version to 2.0.6
Diffstat (limited to 'infra/base-images')
| -rw-r--r-- | infra/base-images/base-builder/Dockerfile | 3 | ||||
| -rwxr-xr-x | infra/base-images/base-builder/compile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index 7522338b4..25f28ef94 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -63,8 +63,9 @@ RUN export PYTHON_DEPS="\ # Install latest atheris for python fuzzing, pyinstaller for fuzzer packaging, # six for Bazel rules. +RUN echo ATHERIS INSTALL RUN unset CFLAGS CXXFLAGS && pip3 install -v --no-cache-dir \ - atheris==1.0.11 pyinstaller==4.1 six==1.15.0 && \ + atheris>=2.0.6 pyinstaller==4.1 six==1.15.0 && \ rm -rf /tmp/* # Download and install the latest stable Go. diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile index 696359871..9af91b2e4 100755 --- a/infra/base-images/base-builder/compile +++ b/infra/base-images/base-builder/compile @@ -118,7 +118,7 @@ export CFLAGS="$CFLAGS $SANITIZER_FLAGS $COVERAGE_FLAGS" export CXXFLAGS="$CFLAGS $CXXFLAGS_EXTRA" if [ "$FUZZING_LANGUAGE" = "python" ]; then - sanitizer_with_fuzzer_lib_dir=`python3 -c "import atheris; import os; print(os.path.dirname(atheris.path()))"` + sanitizer_with_fuzzer_lib_dir=`python3 -c "import atheris; import os; print(atheris.path())"` sanitizer_with_fuzzer_output_lib=$OUT/sanitizer_with_fuzzer.so if [ "$SANITIZER" = "address" ]; then cp $sanitizer_with_fuzzer_lib_dir/asan_with_fuzzer.so $sanitizer_with_fuzzer_output_lib |