diff options
| author | Jonathan Metzman <metzman@chromium.org> | 2019-04-30 20:56:18 +0000 |
|---|---|---|
| committer | Jonathan Metzman <metzman@chromium.org> | 2019-04-30 20:56:18 +0000 |
| commit | 0128c9bfa882ac8ca16929201352e3d8bea9aff8 (patch) | |
| tree | 489fe1452580d40cf3d4f5e799f15c7e906281b9 /lib/fuzzer/FuzzerDriver.cpp | |
| parent | 8a8060f4fdb751a3ccf9a63d7c8ab5928f801abe (diff) | |
| download | compiler-rt-0128c9bfa882ac8ca16929201352e3d8bea9aff8.tar.gz | |
[libFuzzer] Replace -seed_corpus to better support fork mode on Win
Summary:
Pass seed corpus list in a file to get around argument length limits on Windows.
This limit was preventing many uses of fork mode on Windows.
Reviewers: kcc, morehouse
Reviewed By: kcc
Subscribers: #sanitizers, llvm-commits
Tags: #sanitizers, #llvm
Differential Revision: https://reviews.llvm.org/D60980
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359610 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer/FuzzerDriver.cpp')
| -rw-r--r-- | lib/fuzzer/FuzzerDriver.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/lib/fuzzer/FuzzerDriver.cpp b/lib/fuzzer/FuzzerDriver.cpp index a51ac9310..b9c892747 100644 --- a/lib/fuzzer/FuzzerDriver.cpp +++ b/lib/fuzzer/FuzzerDriver.cpp @@ -763,16 +763,25 @@ int FuzzerDriver(int *argc, char ***argv, UserCallback Callback) { exit(0); } - // Parse -seed_inputs=file1,file2,... + // Parse -seed_inputs=file1,file2,... or -seed_inputs=@seed_inputs_file Vector<std::string> ExtraSeedFiles; if (Flags.seed_inputs) { - std::string s = Flags.seed_inputs; - size_t comma_pos; - while ((comma_pos = s.find_last_of(',')) != std::string::npos) { - ExtraSeedFiles.push_back(s.substr(comma_pos + 1)); - s = s.substr(0, comma_pos); + std::string SeedInputs; + if (Flags.seed_inputs[0] == '@') + SeedInputs = FileToString(Flags.seed_inputs + 1); // File contains list. + else + SeedInputs = Flags.seed_inputs; // seed_inputs contains the list. + if (SeedInputs.empty()) { + Printf("seed_inputs is empty or @file does not exist.\n"); + exit(1); + } + // Parse SeedInputs. + size_t comma_pos = 0; + while ((comma_pos = SeedInputs.find_last_of(',')) != std::string::npos) { + ExtraSeedFiles.push_back(SeedInputs.substr(comma_pos + 1)); + SeedInputs = SeedInputs.substr(0, comma_pos); } - ExtraSeedFiles.push_back(s); + ExtraSeedFiles.push_back(SeedInputs); } F->Loop(*Inputs, ExtraSeedFiles); |
