[lib/Fuzzer] fix build with assertions

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238235 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Fuzzer/FuzzerCrossOver.cpp b/lib/Fuzzer/FuzzerCrossOver.cpp
index f03a94a54dd9a7b1f5967710af29093933a5a634..d93ce5cf4fb8a433e1c33627657d6c7c85551dd3 100644 (file)
--- a/lib/Fuzzer/FuzzerCrossOver.cpp
+++ b/lib/Fuzzer/FuzzerCrossOver.cpp
@@ -19,6 +19,7 @@ namespace fuzzer {
 size_t CrossOver(const uint8_t *Data1, size_t Size1,
                  const uint8_t *Data2, size_t Size2,
                  uint8_t *Out, size_t MaxOutSize) {
+  assert(Size1 || Size2);
   MaxOutSize = rand() % MaxOutSize + 1;
   size_t OutPos = 0;
   size_t Pos1 = 0;

diff --git a/lib/Fuzzer/FuzzerLoop.cpp b/lib/Fuzzer/FuzzerLoop.cpp
index 34ceda4fb4d9ef86c9bb48b6eac08e2cd303bb75..1b6a82fe4a8b00090e5eb31e648cdd17d1c88fc7 100644 (file)
--- a/lib/Fuzzer/FuzzerLoop.cpp
+++ b/lib/Fuzzer/FuzzerLoop.cpp
@@ -287,7 +287,7 @@ void Fuzzer::MutateAndTestOne(Unit *U) {
     size_t Size = U->size();
     U->resize(Options.MaxLen);
     size_t NewSize = USF.Mutate(U->data(), Size, U->size());
-    assert(NewSize > 0 && NewSize <= Options.MaxLen);
+    assert(NewSize > 0 && NewSize <= (size_t)Options.MaxLen);
     U->resize(NewSize);
     RunOneAndUpdateCorpus(*U);
     size_t NumTraceBasedMutations = StopTraceRecording();
@@ -309,13 +309,13 @@ void Fuzzer::Loop(size_t NumIterations) {
       CurrentUnit = Corpus[J1];
       MutateAndTestOne(&CurrentUnit);
       // Now, cross with others.
-      if (Options.DoCrossOver) {
+      if (Options.DoCrossOver && !Corpus[J1].empty()) {
         for (size_t J2 = 0; J2 < Corpus.size(); J2++) {
           CurrentUnit.resize(Options.MaxLen);
           size_t NewSize = USF.CrossOver(
               Corpus[J1].data(), Corpus[J1].size(), Corpus[J2].data(),
               Corpus[J2].size(), CurrentUnit.data(), CurrentUnit.size());
-          assert(NewSize > 0 && NewSize <= Options.MaxLen);
+          assert(NewSize > 0 && NewSize <= (size_t)Options.MaxLen);
           CurrentUnit.resize(NewSize);
           MutateAndTestOne(&CurrentUnit);
         }