diff options
| author | Kostya Serebryany <kcc@google.com> | 2017-11-15 16:42:52 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2017-11-15 16:42:52 +0000 |
| commit | fcc081e71ac517e6f21e20144300f019ce88ecc4 (patch) | |
| tree | 8fffa49c4fed76822ec08ee92c9a24b9745e86ac | |
| parent | 0066b15e48e7b40e43051c9241760e7066582a96 (diff) | |
[libFuzzer] respect max_len during merge
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@318302 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/fuzzer/FuzzerMerge.cpp | 2 | ||||
| -rw-r--r-- | test/fuzzer/merge.test | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/fuzzer/FuzzerMerge.cpp b/lib/fuzzer/FuzzerMerge.cpp index 9b21a0917..934871b15 100644 --- a/lib/fuzzer/FuzzerMerge.cpp +++ b/lib/fuzzer/FuzzerMerge.cpp @@ -379,7 +379,7 @@ void Fuzzer::CrashResistantMerge(const Vector<std::string> &Args, Printf("MERGE-OUTER: %zd new files with %zd new features added\n", NewFiles.size(), NumNewFeatures); for (auto &F: NewFiles) - WriteToOutputCorpus(FileToVector(F)); + WriteToOutputCorpus(FileToVector(F, MaxInputLen)); // We are done, delete the control file if it was a temporary one. if (!MergeControlFilePathOrNull) RemoveFile(CFPath); diff --git a/test/fuzzer/merge.test b/test/fuzzer/merge.test index 262f26e5b..d77a4473b 100644 --- a/test/fuzzer/merge.test +++ b/test/fuzzer/merge.test @@ -58,7 +58,11 @@ MERGE_WITH_CRASH: MERGE-OUTER: succesfull in 2 attempt(s) MERGE_WITH_CRASH: MERGE-OUTER: 3 new files # Check that we actually limit the size with max_len +RUN: rm %t/T1/* +RUN: echo 'FUZZER' > %t/T2/FUZZER RUN: %t-FullCoverageSetTest -merge=1 %t/T1 %t/T2 -max_len=5 2>&1 | FileCheck %s --check-prefix=MERGE_LEN5 +RUN: not grep FUZZER %t/T1/* +RUN: grep FUZZE %t/T1/* MERGE_LEN5: MERGE-OUTER: succesfull in 1 attempt(s) RUN: rm -rf %t/T1/* %t/T2/* |