commit 66d06c7b14b717efcd8917c2363dddef1df73a85
author Vitaly Buka <vitalybuka@google.com> Sat Mar 04 01:22:34 2017 -0800
committer Vitaly Buka <vitalybuka@gmail.com> Sat Mar 04 11:36:56 2017 -0800
tree 36221d6fbf15d106a3e3e20d508f5d921ef50d90
parent 4344a469ac7b607b3fe2b5338cae5ec277cf7bf2

Instead of deleting field just restart mutator if source was not selected.
Deleting field without proper checks may leave message unchanged.

src/protobuf_mutator.cc

diff --git a/src/protobuf_mutator.cc b/src/protobuf_mutator.cc
index f2e506b..248de5f 100644
--- a/src/protobuf_mutator.cc
+++ b/src/protobuf_mutator.cc
@@ -432,37 +432,40 @@
 ProtobufMutator::ProtobufMutator(uint32_t seed) : random_(seed) {}
 
 void ProtobufMutator::Mutate(Message* message, size_t size_increase_hint) {
-  MutationSampler mutation(keep_initialized_, size_increase_hint, &random_,
-                           message);
-  switch (mutation.mutation()) {
-    case Mutation::None:
-      break;
-    case Mutation::Add:
-      if (GetRandomBool(&random_)) {
-        CreateField()(mutation.field(), 0, this);
-      } else {
-        CreateDefaultField()(mutation.field());
-      }
-      break;
-    case Mutation::Mutate:
-      MutateField()(mutation.field(), size_increase_hint / 2, this);
-      break;
-    case Mutation::Delete:
-      DeleteField()(mutation.field());
-      break;
-    case Mutation::Copy: {
-      DataSourceSampler source(mutation.field(), &random_, message);
-      if (source.IsEmpty()) {
-        // Fallback to message deletion.
+  bool repeat;
+  do {
+    repeat = false;
+    MutationSampler mutation(keep_initialized_, size_increase_hint, &random_,
+                             message);
+    switch (mutation.mutation()) {
+      case Mutation::None:
+        break;
+      case Mutation::Add:
+        if (GetRandomBool(&random_)) {
+          CreateField()(mutation.field(), 0, this);
+        } else {
+          CreateDefaultField()(mutation.field());
+        }
+        break;
+      case Mutation::Mutate:
+        MutateField()(mutation.field(), size_increase_hint / 2, this);
+        break;
+      case Mutation::Delete:
         DeleteField()(mutation.field());
         break;
+      case Mutation::Copy: {
+        DataSourceSampler source(mutation.field(), &random_, message);
+        if (source.IsEmpty()) {
+          repeat = true;
+          break;
+        }
+        CopyField()(source.field(), mutation.field());
+        break;
       }
-      CopyField()(source.field(), mutation.field());
-      break;
+      default:
+        assert(false && "unexpected mutation");
     }
-    default:
-      assert(false && "unexpected mutation");
-  }
+  } while (repeat);
 
   if (keep_initialized_ && !message->IsInitialized()) {
     InitializeMessage(message, kMaxInitializeDepth);