simplified example

Author: PBetzler

src/advanced_examples/CMakeLists.txt

@@ -1,5 +1,6 @@
 set(OPENSSL_USE_STATIC_LIBS TRUE)
 find_package(OpenSSL REQUIRED)
+#include(libprotobuf-mutator)
 
 add_library(explore_me_advanced
     explore_me.cpp

src/advanced_examples/custom_mutator_example_checks_test.cpp

@@ -7,52 +7,36 @@
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 #include <gtest/gtest.h>
 
-TEST(ExploreCustomMutatorExampleChecks, DeveloperTest) {
-    SpecialRequirementsStruct inputStruct = (SpecialRequirementsStruct) {.a=0, .b= 10, .c= 0, .c_size= 0};
-    inputStruct.c = malloc(sizeof("Developer"));
-    inputStruct.c_size = sizeof("Developer");
-    EXPECT_NO_THROW(ExploreCustomMutatorExampleChecks(&inputStruct));
+TEST(ExploreStructuredInputChecks, DeveloperTest) {
+    InputStruct inputStruct = (InputStrut) {.a=0, .b= 10, .c="Developer"};
+    EXPECT_NO_THROW(ExploreStructuredInputChecks(inputStruct));
 }
 
 TEST(ExploreStructuredInputChecks, MaintainerTest) {
-    InputStrut inputStruct = (InputStruct) {.a=20, .b= -10, .c=0};
-    inputStruct.c = malloc(sizeof("Maintainer"));
-    inputStruct.c_size = sizeof("Maintainer");
-    EXPECT_NO_THROW(ExploreCustomMutatorExampleChecks(&inputStruct));
+    InputStruct inputStruct = (InputStruct) {.a=20, .b= -10, .c="Maintainer"};
+    EXPECT_NO_THROW(ExploreStructuredInputChecks(inputStruct));
 }
 
 #endif
 
 FUZZ_TEST(const uint8_t *data, size_t size) {
-    SpecialRequirementsStruct* inputStruct = (SpecialRequirementsStruct*) data;
-    ExploreCustomMutatorExampleChecks(inputStruct);
+    FuzzedDataProvider fdp(data, size);
+    long a = fdp.ConsumeIntegral<long>();
+    long b = fdp.ConsumeIntegral<long>();
+    std::string c = fdp.ConsumeRemainingBytesAsString();
 
-    free(inputStruct->c);
+    InputStruct inputStruct = (InputStruct) {
+            .a = a,
+            .b = b,
+            .c = c,
+    };
+    ExploreStructuredInputChecks(inputStruct);
 }
 
 
 extern "C" size_t LLVMFuzzerCustomMutator(uint8_t *Data, size_t Size,
                                           size_t MaxSize, unsigned int Seed) {
     std::cout << "In custom mutator.\n";
 
-    FuzzedDataProvider fdp(Data, Size);
-    long a = fdp.ConsumeIntegral<long>();
-    long b = fdp.ConsumeIntegral<long>();
-    std::string tempC = fdp.ConsumeRemainingBytesAsString();
-    size_t c_size = strlen(tempC.c_str()) +1;
-    char* c = (char*) malloc(c_size);
-    strncpy(c, tempC.c_str(), c_size);
-    SpecialRequirementsStruct specialRequirementsStruct = (SpecialRequirementsStruct) {
-        .a= a, .b=b, .c_size=c_size, .c= c
-    };
-    size_t size1 = sizeof(specialRequirementsStruct);
-
-    if (MaxSize >= size1) {
-        free(Data);
-        Data = (uint8_t*) malloc (size1);
-        std::memcpy(Data, &specialRequirementsStruct, size1);
-        return sizeof(specialRequirementsStruct);
-    } else {
-        return MaxSize;
-    }
+    return Size;
 }

src/advanced_examples/structured_input_checks_test.cpp

@@ -20,10 +20,14 @@ TEST(ExploreStructuredInputChecks, MaintainerTest) {
 
 FUZZ_TEST(const uint8_t *data, size_t size) {
     FuzzedDataProvider fdp(data, size);
-    int a = fdp.ConsumeIntegral<int>();
-    int b = fdp.ConsumeIntegral<int>();
+    long a = fdp.ConsumeIntegral<long>();
+    long b = fdp.ConsumeIntegral<long>();
     std::string c = fdp.ConsumeRemainingBytesAsString();
-    InputStruct inputStruct = (InputStruct) {.a=a, .b= b, .c=c};
 
+    InputStruct inputStruct = (InputStruct) {
+        .a = a,
+        .b = b,
+        .c = c,
+    };
     ExploreStructuredInputChecks(inputStruct);
 }