diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-23 22:51:15 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-23 22:51:15 +0000 |
| commit | 6ef352c644106bdf993c1a4fcc0a253716b92780 (patch) | |
| tree | b40cfd9e8802b2879a81663220a69c0d24691ebf /libfuzzer/FuzzerMerge.cpp | |
| parent | 4e031b3a08a06e36fa74d66192dac5250ad69131 (diff) | |
| parent | 834c89f16bc1701b301eb05e07ce58ea038e096f (diff) | |
| download | libfuzzer-sys-6ef352c644106bdf993c1a4fcc0a253716b92780.tar.gz | |
Snap for 8347268 from 834c89f16bc1701b301eb05e07ce58ea038e096f to mainline-go-cellbroadcast-release
Change-Id: Idcd62e8a39fe9f2b97ca239c2b88419102156991
Diffstat (limited to 'libfuzzer/FuzzerMerge.cpp')
| -rw-r--r-- | libfuzzer/FuzzerMerge.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libfuzzer/FuzzerMerge.cpp b/libfuzzer/FuzzerMerge.cpp index 162453c..e3ad8b3 100644 --- a/libfuzzer/FuzzerMerge.cpp +++ b/libfuzzer/FuzzerMerge.cpp @@ -82,9 +82,9 @@ bool Merger::Parse(std::istream &IS, bool ParseCoverage) { while (std::getline(IS, Line, '\n')) { std::istringstream ISS1(Line); std::string Marker; - uint32_t N; - if (!(ISS1 >> Marker) || !(ISS1 >> N)) - return false; + size_t N; + ISS1 >> Marker; + ISS1 >> N; if (Marker == "STARTED") { // STARTED FILE_ID FILE_SIZE if (ExpectedStartMarker != N) @@ -137,8 +137,6 @@ size_t Merger::Merge(const Set<uint32_t> &InitialFeatures, const Set<uint32_t> &InitialCov, Set<uint32_t> *NewCov, Vector<std::string> *NewFiles) { NewFiles->clear(); - NewFeatures->clear(); - NewCov->clear(); assert(NumFilesInFirstCorpus <= Files.size()); Set<uint32_t> AllFeatures = InitialFeatures; |