summaryrefslogtreecommitdiff
path: root/lib/fuzzer/FuzzerMerge.cpp
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2019-02-12 02:18:53 +0000
committerKostya Serebryany <kcc@google.com>2019-02-12 02:18:53 +0000
commit57bf2400336b66c1c1fbc112228907474a451fc2 (patch)
tree712a21a3d6170cc787a3539e8ae35f69158a697b /lib/fuzzer/FuzzerMerge.cpp
parent9e2f5fb031ea0548006f50d785b82450529d3704 (diff)
downloadcompiler-rt-57bf2400336b66c1c1fbc112228907474a451fc2.tar.gz
[libFuzzer] teach the fork mode to ignore OOMs and timeouts
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@353792 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer/FuzzerMerge.cpp')
-rw-r--r--lib/fuzzer/FuzzerMerge.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/fuzzer/FuzzerMerge.cpp b/lib/fuzzer/FuzzerMerge.cpp
index 4d00f7ed9..c61169a3a 100644
--- a/lib/fuzzer/FuzzerMerge.cpp
+++ b/lib/fuzzer/FuzzerMerge.cpp
@@ -299,7 +299,6 @@ void CrashResistantMerge(const Vector<std::string> &Args,
Command BaseCmd(Args);
BaseCmd.removeFlag("merge");
BaseCmd.removeFlag("fork");
- bool Success = false;
for (size_t Attempt = 1; Attempt <= NumAttempts; Attempt++) {
Fuzzer::MaybeExitGracefully();
Printf("MERGE-OUTER: attempt %zd\n", Attempt);
@@ -309,14 +308,9 @@ void CrashResistantMerge(const Vector<std::string> &Args,
auto ExitCode = ExecuteCommand(Cmd);
if (!ExitCode) {
Printf("MERGE-OUTER: succesfull in %zd attempt(s)\n", Attempt);
- Success = true;
break;
}
}
- if (!Success) {
- Printf("MERGE-OUTER: zero succesfull attempts, exiting\n");
- exit(1);
- }
// Read the control file and do the merge.
Merger M;
std::ifstream IF(CFPath);