commit a5b918a1ad5ce7f6372f6198d84afc9922826f7a
author Robert Swiecki <robert@swiecki.net> Wed Mar 07 23:59:53 2018 +0100
committer Robert Swiecki <robert@swiecki.net> Wed Mar 07 23:59:53 2018 +0100
tree 785b989cf52e22a18682ce4d8456117adf3af522
parent 5e26bd995c9cdd5db9b5463d7108e295220b9cec

honggfuzz: even more fields into substructs

honggfuzz.c

diff --git a/honggfuzz.c b/honggfuzz.c
index c7e56df..27630ad 100644
--- a/honggfuzz.c
+++ b/honggfuzz.c
@@ -189,8 +189,8 @@
         LOG_F("Couldn't parse dictionary file ('%s')", hfuzz.mutate.dictionaryFile);
     }
 
-    if (hfuzz.blacklistFile && (input_parseBlacklist(&hfuzz) == false)) {
-        LOG_F("Couldn't parse stackhash blacklist file ('%s')", hfuzz.blacklistFile);
+    if (hfuzz.feedback.blacklistFile && (input_parseBlacklist(&hfuzz) == false)) {
+        LOG_F("Couldn't parse stackhash blacklist file ('%s')", hfuzz.feedback.blacklistFile);
     }
 #define hfuzzl hfuzz.linux
     if (hfuzzl.symsBlFile &&
@@ -203,9 +203,9 @@
         LOG_F("Couldn't parse symbols whitelist file ('%s')", hfuzzl.symsWlFile);
     }
 
-    if (hfuzz.dynFileMethod != _HF_DYNFILE_NONE) {
-        if (!(hfuzz.feedback = files_mapSharedMem(
-                  sizeof(feedback_t), &hfuzz.bbFd, "hfuzz-feedback", hfuzz.io.workDir))) {
+    if (hfuzz.feedback.dynFileMethod != _HF_DYNFILE_NONE) {
+        if (!(hfuzz.feedback.feedbackMap = files_mapSharedMem(
+                  sizeof(feedback_t), &hfuzz.feedback.bbFd, "hfuzz-feedback", hfuzz.io.workDir))) {
             LOG_F("files_mapSharedMem(sz=%zu, dir='%s') failed", sizeof(feedback_t),
                 hfuzz.io.workDir);
         }
@@ -247,8 +247,8 @@
     fuzz_threadsStop(&hfuzz, threads);
 
     /* Clean-up global buffers */
-    if (hfuzz.blacklist) {
-        free(hfuzz.blacklist);
+    if (hfuzz.feedback.blacklist) {
+        free(hfuzz.feedback.blacklist);
     }
     if (hfuzz.linux.symsBl) {
         free(hfuzz.linux.symsBl);