diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2017-02-03 16:28:00 +0100 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2017-02-03 16:28:00 +0100 |
| commit | 6dc4581d4e88006f68dd7cd3dea0be3a032890c5 (patch) | |
| tree | 09000957caa1fbe63b6fc6d7980a1d441b379d7d /fuzz | |
| parent | 0741105a4a7dfb96d09f3a7321b15f21acddd733 (diff) | |
| download | nss-hg-6dc4581d4e88006f68dd7cd3dea0be3a032890c5.tar.gz | |
Bug 1336457 - Update libFuzzer revision r=franziskus
Differential Revision: https://nss-review.dev.mozaws.net/D190
Diffstat (limited to 'fuzz')
| -rwxr-xr-x | fuzz/clone_libfuzzer.sh | 10 | ||||
| -rw-r--r-- | fuzz/fuzz.gyp | 21 |
2 files changed, 6 insertions, 25 deletions
diff --git a/fuzz/clone_libfuzzer.sh b/fuzz/clone_libfuzzer.sh index ad2f9566c..d57e6d807 100755 --- a/fuzz/clone_libfuzzer.sh +++ b/fuzz/clone_libfuzzer.sh @@ -1,7 +1,7 @@ #!/bin/sh d=$(dirname $0) -$d/git-copy.sh https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer 33c20f597a2e312611d52677ff0fdd9335b485b7 $d/libFuzzer +$d/git-copy.sh https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer 0b27dad707a1d67ec854423e25b1a521c9d5ab7a $d/libFuzzer # [https://llvm.org/bugs/show_bug.cgi?id=31318] # This prevents a known buffer overrun that won't be fixed as the affected code @@ -11,7 +11,7 @@ cat <<EOF | patch -p0 -d $d diff --git libFuzzer/FuzzerLoop.cpp libFuzzer/FuzzerLoop.cpp --- libFuzzer/FuzzerLoop.cpp +++ libFuzzer/FuzzerLoop.cpp -@@ -472,6 +472,9 @@ +@@ -476,6 +476,9 @@ uint8_t dummy; ExecuteCallback(&dummy, 0); @@ -30,9 +30,9 @@ cat <<EOF | patch -p0 -d $d diff --git libFuzzer/FuzzerTracePC.cpp libFuzzer/FuzzerTracePC.cpp --- libFuzzer/FuzzerTracePC.cpp +++ libFuzzer/FuzzerTracePC.cpp -@@ -24,6 +24,12 @@ - #include <set> - #include <sstream> +@@ -31,6 +31,12 @@ + __sancov_trace_pc_guard_8bit_counters[fuzzer::TracePC::kNumPCs]; + uintptr_t __sancov_trace_pc_pcs[fuzzer::TracePC::kNumPCs]; +#if defined(__clang_major__) && (__clang_major__ == 3) +void __sanitizer_dump_coverage(const uintptr_t *pcs, uintptr_t len) { diff --git a/fuzz/fuzz.gyp b/fuzz/fuzz.gyp index 731c2131f..6c9e0abc1 100644 --- a/fuzz/fuzz.gyp +++ b/fuzz/fuzz.gyp @@ -42,26 +42,7 @@ ['fuzz_oss==0', { 'type': 'static_library', 'sources': [ - 'libFuzzer/FuzzerCrossOver.cpp', - 'libFuzzer/FuzzerDriver.cpp', - 'libFuzzer/FuzzerExtFunctionsDlsym.cpp', - 'libFuzzer/FuzzerExtFunctionsWeak.cpp', - 'libFuzzer/FuzzerExtFunctionsWeakAlias.cpp', - 'libFuzzer/FuzzerIO.cpp', - 'libFuzzer/FuzzerIOPosix.cpp', - 'libFuzzer/FuzzerIOWindows.cpp', - 'libFuzzer/FuzzerLoop.cpp', - 'libFuzzer/FuzzerMain.cpp', - 'libFuzzer/FuzzerMerge.cpp', - 'libFuzzer/FuzzerMutate.cpp', - 'libFuzzer/FuzzerSHA1.cpp', - 'libFuzzer/FuzzerTracePC.cpp', - 'libFuzzer/FuzzerTraceState.cpp', - 'libFuzzer/FuzzerUtil.cpp', - 'libFuzzer/FuzzerUtilDarwin.cpp', - 'libFuzzer/FuzzerUtilLinux.cpp', - 'libFuzzer/FuzzerUtilPosix.cpp', - 'libFuzzer/FuzzerUtilWindows.cpp', + '<!@(ls <(DEPTH)/fuzz/libFuzzer/*.cpp)', ], 'cflags/': [ ['exclude', '-fsanitize-coverage'], |