diff options
| author | Andrzej Hunt <andrzej@ahunt.org> | 2021-02-27 14:21:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-28 19:46:58 +0100 |
| commit | 44b36a0602b04342566362bce3f6bed7d2b096e4 (patch) | |
| tree | dca802aed08d9daf04369a131777dea3877ca52c /vcl/Executable_rtffuzzer.mk | |
| parent | 06c3eafce490fbfb8f8c477cb8dfe7f83e1fca9c (diff) | |
Upgrade fuzzers to LIB_FUZZING_ENGINE
And check that LIB_FUZZING_ENGINE is set during configure.
Because:
1. It's easier to build locally this way (you don't need to build or hack a
libFuzzingEngine.a - instead you can just specify
LIB_FUZZING_ENGINE=-fsanitize=fuzzer to produce a valid build).
2. Using -lFuzzingEngine is deprecated [1] for various reasons [2].
The old behaviour can be emulated if desired by setting
LIB_FUZZING_ENGINE=-lFuzzingEngine .
This patch was tested as follows:
- Building LO within oss-fuzz via:
python infra/helper.py build_fuzzers --sanitizer address libreoffice </path/to/patched-libreoffice-core>
python infra/helper.py check_build libreoffice
- Building LO fuzzers standalone via:
export CC="clang-11"
export CXX="clang++-11 -stdlib=libc++"
export CFLAGS="-fsanitize=address -fsanitize-address-use-after-scope -fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION"
export CXXFLAGS="$CFLAGS -stdlib=libc++"
export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"
export LIB_FUZZING_ENGINE=-fsanitize=fuzzer
./autogen.sh --with-distro=LibreOfficeOssFuzz --with-system-libxml
make fuzzers
(--with-system-libxml only appears to be needed because of issues
specific to my build environment/Suse 15.2. I'm invoking clang-11 simply
because that's the most modern clang I have installed, plain clang should
also work on most sufficiently modern systems).
[1]
https://github.com/google/oss-fuzz/blob/481280c65048fd12fb2141b9225af511a9ef7ed2/infra/presubmit.py#L46
[2] https://github.com/google/oss-fuzz/issues/2164
Change-Id: Iddb577c30a39620e72372ef6c2d3fda67f8aabdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111691
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/Executable_rtffuzzer.mk')
| -rw-r--r-- | vcl/Executable_rtffuzzer.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/Executable_rtffuzzer.mk b/vcl/Executable_rtffuzzer.mk index 28f0a3afe676..df486a6b50bf 100644 --- a/vcl/Executable_rtffuzzer.mk +++ b/vcl/Executable_rtffuzzer.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_exception_objects,rtffuzzer,\ )) $(eval $(call gb_Executable_add_libs,rtffuzzer,\ - -lFuzzingEngine \ + $(LIB_FUZZING_ENGINE) \ )) # vim: set noet sw=4 ts=4: |