[llvm] r238235 - [lib/Fuzzer] fix build with assertions

[Kostya Serebryany]

Author: kcc
Date: Tue May 26 14:29:33 2015
New Revision: 238235

URL: http://llvm.org/viewvc/llvm-project?rev=238235&view=rev
Log:
[lib/Fuzzer] fix build with assertions

Modified:
    llvm/trunk/lib/Fuzzer/FuzzerCrossOver.cpp
    llvm/trunk/lib/Fuzzer/FuzzerLoop.cpp

Modified: llvm/trunk/lib/Fuzzer/FuzzerCrossOver.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerCrossOver.cpp?rev=238235&r1=238234&r2=238235&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerCrossOver.cpp (original)
+++ llvm/trunk/lib/Fuzzer/FuzzerCrossOver.cpp Tue May 26 14:29:33 2015
@@ -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;

Modified: llvm/trunk/lib/Fuzzer/FuzzerLoop.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerLoop.cpp?rev=238235&r1=238234&r2=238235&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerLoop.cpp (original)
+++ llvm/trunk/lib/Fuzzer/FuzzerLoop.cpp Tue May 26 14:29:33 2015
@@ -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);
         }