Fix nested post-processor example

Fixes #164.

Author: vitalybuka

README.md

@@ -118,20 +118,20 @@ may corrupt the reproducer so it stops triggering the bug.
 Note: You can add callback for any nested message and you can add multiple callbacks for
 the same message type.
 ```
-DEFINE_PROTO_FUZZER(const MyMessageType& input) {
-  static PostProcessorRegistration reg1 = {
-      [](MyMessageType* message, unsigned int seed) {
-        TweakMyMessage(message, seed);
-      }};
-  static PostProcessorRegistration reg2 = {
-      [](MyMessageType* message, unsigned int seed) {
-        DifferentTweakMyMessage(message, seed);
-      }};
-  static PostProcessorRegistration reg_nested = {
-      [](MyMessageType::Nested* message, unsigned int seed) {
-        TweakMyNestedMessage(message, seed);
-      }};
+static PostProcessorRegistration<MyMessageType> reg1 = {
+    [](MyMessageType* message, unsigned int seed) {
+      TweakMyMessage(message, seed);
+    }};
+static PostProcessorRegistration<MyMessageType> reg2 = {
+    [](MyMessageType* message, unsigned int seed) {
+      DifferentTweakMyMessage(message, seed);
+    }};
+static PostProcessorRegistration<MyMessageType::Nested> reg_nested = {
+    [](MyMessageType::Nested* message, unsigned int seed) {
+      TweakMyNestedMessage(message, seed);
+    }};
 
+DEFINE_PROTO_FUZZER(const MyMessageType& input) {
   // Code which needs to be fuzzed.
   ConsumeMyMessageType(input);
 }

examples/libfuzzer/libfuzzer_bin_example.cc

@@ -21,26 +21,29 @@
 
 protobuf_mutator::protobuf::LogSilencer log_silincer;
 
-protobuf_mutator::libfuzzer::PostProcessorRegistration<libfuzzer_example::Msg>
-    reg = {[](libfuzzer_example::Msg* message, unsigned int seed) {
+template <class Proto>
+using PostProcessor =
+    protobuf_mutator::libfuzzer::PostProcessorRegistration<Proto>;
+
+static PostProcessor<libfuzzer_example::Msg> reg1 = {
+    [](libfuzzer_example::Msg* message, unsigned int seed) {
       message->set_optional_uint64(
           std::hash<std::string>{}(message->optional_string()));
+    }};
 
-      if (message->has_any()) {
-        auto* any = message->mutable_any();
-
-        // Guide mutator to usefull 'Any' types.
-        static const char* const expected_types[] = {
-            "type.googleapis.com/google.protobuf.DescriptorProto",
-            "type.googleapis.com/google.protobuf.FileDescriptorProto",
-        };
-
-        if (!std::count(std::begin(expected_types), std::end(expected_types),
-                        any->type_url())) {
-          const size_t num =
-              (std::end(expected_types) - std::begin(expected_types));
-          any->set_type_url(expected_types[seed % num]);
-        }
+static PostProcessor<google::protobuf::Any> reg2 = {
+    [](google::protobuf::Any* any, unsigned int seed) {
+      // Guide mutator to usefull 'Any' types.
+      static const char* const expected_types[] = {
+          "type.googleapis.com/google.protobuf.DescriptorProto",
+          "type.googleapis.com/google.protobuf.FileDescriptorProto",
+      };
+
+      if (!std::count(std::begin(expected_types), std::end(expected_types),
+                      any->type_url())) {
+        const size_t num =
+            (std::end(expected_types) - std::begin(expected_types));
+        any->set_type_url(expected_types[seed % num]);
       }
     }};
 

examples/libfuzzer/libfuzzer_example.cc

@@ -21,26 +21,29 @@
 
 protobuf_mutator::protobuf::LogSilencer log_silincer;
 
-protobuf_mutator::libfuzzer::PostProcessorRegistration<libfuzzer_example::Msg>
-    reg = {[](libfuzzer_example::Msg* message, unsigned int seed) {
+template <class Proto>
+using PostProcessor =
+    protobuf_mutator::libfuzzer::PostProcessorRegistration<Proto>;
+
+static PostProcessor<libfuzzer_example::Msg> reg1 = {
+    [](libfuzzer_example::Msg* message, unsigned int seed) {
       message->set_optional_uint64(
           std::hash<std::string>{}(message->optional_string()));
+    }};
 
-      if (message->has_any()) {
-        auto* any = message->mutable_any();
-
-        // Guide mutator to usefull 'Any' types.
-        static const char* const expected_types[] = {
-            "type.googleapis.com/google.protobuf.DescriptorProto",
-            "type.googleapis.com/google.protobuf.FileDescriptorProto",
-        };
-
-        if (!std::count(std::begin(expected_types), std::end(expected_types),
-                        any->type_url())) {
-          const size_t num =
-              (std::end(expected_types) - std::begin(expected_types));
-          any->set_type_url(expected_types[seed % num]);
-        }
+static PostProcessor<google::protobuf::Any> reg2 = {
+    [](google::protobuf::Any* any, unsigned int seed) {
+      // Guide mutator to usefull 'Any' types.
+      static const char* const expected_types[] = {
+          "type.googleapis.com/google.protobuf.DescriptorProto",
+          "type.googleapis.com/google.protobuf.FileDescriptorProto",
+      };
+
+      if (!std::count(std::begin(expected_types), std::end(expected_types),
+                      any->type_url())) {
+        const size_t num =
+            (std::end(expected_types) - std::begin(expected_types));
+        any->set_type_url(expected_types[seed % num]);
       }
     }};