fix shared memory leaks in afl-showmap, initialize cmplog_mode

1 files changed, 9 insertions, 0 deletions

diff --git a/src/afl-showmap.c b/src/afl-showmap.c
index 1ab7d0a8..24e83721 100644
--- a/src/afl-showmap.c
+++ b/src/afl-showmap.c
@@ -151,6 +151,7 @@ static sharedmem_t *deinit_shmem(afl_forkserver_t *fsrv,
 
   afl_shm_deinit(shm_fuzz);
   fsrv->support_shmem_fuzz = 0;
+  fsrv->shmem_fuzz_len = NULL;
   fsrv->shmem_fuzz = NULL;
   ck_free(shm_fuzz);
   return NULL;
@@ -811,6 +812,8 @@ int main(int argc, char **argv_orig, char **envp) {
 
   //  if (afl->shmem_testcase_mode) { setup_testcase_shmem(afl); }
 
+  /* initialize cmplog_mode */
+  shm.cmplog_mode = 0;
   fsrv->trace_bits = afl_shm_init(&shm, map_size, 0);
   setup_signal_handlers();
 
@@ -865,6 +868,9 @@ int main(int argc, char **argv_orig, char **envp) {
   }
 
   shm_fuzz = ck_alloc(sizeof(sharedmem_t));
+
+  /* initialize cmplog_mode */
+  shm_fuzz->cmplog_mode = 0;
   u8 *map = afl_shm_init(shm_fuzz, MAX_FILE + sizeof(u32), 1);
   if (!map) { FATAL("BUG: Zero return from afl_shm_init."); }
 #ifdef USEMMAP
@@ -991,6 +997,9 @@ int main(int argc, char **argv_orig, char **envp) {
 
   } else {
 
+    if (fsrv->support_shmem_fuzz && !fsrv->use_shmem_fuzz)
+      shm_fuzz = deinit_shmem(fsrv, shm_fuzz);
+
     showmap_run_target(fsrv, use_argv);
     tcnt = write_results_to_file(fsrv, out_file);