From f580f3683cba3de67846e34a0918c953e41f3aaa Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Tue, 26 May 2015 19:29:33 +0000
Subject: [PATCH] [lib/Fuzzer] fix build with assertions

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238235 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Fuzzer/FuzzerCrossOver.cpp | 1 +
 lib/Fuzzer/FuzzerLoop.cpp      | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Fuzzer/FuzzerCrossOver.cpp b/lib/Fuzzer/FuzzerCrossOver.cpp
index f03a94a54dd..d93ce5cf4fb 100644
--- 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 34ceda4fb4d..1b6a82fe4a8 100644
--- 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);
         }
-- 
2.34.1