diff options
| author | Jake Ehrlich <jakehehrlich@google.com> | 2019-10-09 21:01:50 +0000 |
|---|---|---|
| committer | Jake Ehrlich <jakehehrlich@google.com> | 2019-10-09 21:01:50 +0000 |
| commit | 92e35995a6175bd255489b469d7179b504b6c7bf (patch) | |
| tree | 555bfcdca5a10dea26ab49e05fd2f62265ce13a8 | |
| parent | 929efdcea500576c870fc84502b23cb64c1f9124 (diff) | |
| download | compiler-rt-92e35995a6175bd255489b469d7179b504b6c7bf.tar.gz | |
[libFuzzer] Fix Alarm callback in fuchsia.
This patch adds an #if macro to skip the InFuzzingThread() comparison
for fuchsia, similar to what it is done for Windows and NetBSD.
In fuchsia, the alarm callback runs in a separate thread[0], making it fail
the comparison InFuzzingThread(), breaking the -timeout flag.
[0]:
https://github.com/llvm/llvm-project/blob/master/compiler-rt/lib/fuzzer/FuzzerUtilFuchsia.cpp#L323
Author: charco (aka Marco Vanotti)
Differential Revision: https://reviews.llvm.org/D68166
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@374228 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/fuzzer/FuzzerLoop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/fuzzer/FuzzerLoop.cpp b/lib/fuzzer/FuzzerLoop.cpp index df533e877..451a4c173 100644 --- a/lib/fuzzer/FuzzerLoop.cpp +++ b/lib/fuzzer/FuzzerLoop.cpp @@ -273,9 +273,9 @@ void Fuzzer::InterruptCallback() { NO_SANITIZE_MEMORY void Fuzzer::AlarmCallback() { assert(Options.UnitTimeoutSec > 0); - // In Windows Alarm callback is executed by a different thread. + // In Windows and Fuchsia, Alarm callback is executed by a different thread. // NetBSD's current behavior needs this change too. -#if !LIBFUZZER_WINDOWS && !LIBFUZZER_NETBSD +#if !LIBFUZZER_WINDOWS && !LIBFUZZER_NETBSD && !LIBFUZZER_FUCHSIA if (!InFuzzingThread()) return; #endif |