about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2021-02-01 15:21:39 +0100
committervan Hauser <vh@thc.org>2021-02-01 15:21:39 +0100
commit812cf4c9e0f8eff80b8f46907fc8dfcd9458919f (patch)
treeb79e1a3faf6cda049eda7bcbf1cf9a959e6f0631
parent374fa8af4788960ef4a0f5462370b68be6e4fc90 (diff)
downloadafl++-812cf4c9e0f8eff80b8f46907fc8dfcd9458919f.tar.gz
reorder
-rw-r--r--src/afl-fuzz.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index b3a27fc6..d8ebe097 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -1562,10 +1562,10 @@ int main(int argc, char **argv_orig, char **envp) {
         afl->first_trace = ck_realloc(afl->first_trace, map_size);
         afl->map_tmp_buf = ck_realloc(afl->map_tmp_buf, map_size);
 
-        afl_shm_deinit(&afl->shm);
         afl_fsrv_kill(&afl->fsrv);
+        afl_shm_deinit(&afl->shm);
         afl->fsrv.map_size = new_map_size;
-        afl->fsrv.trace_bits = afl_shm_init(&afl->shm, afl->fsrv.map_size,
+        afl->fsrv.trace_bits = afl_shm_init(&afl->shm, new_map_size,
                                             afl->non_instrumented_mode);
         setenv("AFL_NO_AUTODICT", "1", 1);  // loaded already
         afl_fsrv_start(&afl->fsrv, afl->argv, &afl->stop_soon,
@@ -1602,7 +1602,7 @@ int main(int argc, char **argv_orig, char **envp) {
       // only reinitialize when it needs to be larger
       if (map_size < new_map_size) {
 
-        OKF("Re-initializing maps to %u bytes", new_map_size);
+        OKF("Re-initializing maps to %u bytes due cmplog", new_map_size);
 
         afl->virgin_bits = ck_realloc(afl->virgin_bits, map_size);
         afl->virgin_tmout = ck_realloc(afl->virgin_tmout, map_size);
@@ -1614,9 +1614,9 @@ int main(int argc, char **argv_orig, char **envp) {
         afl->first_trace = ck_realloc(afl->first_trace, map_size);
         afl->map_tmp_buf = ck_realloc(afl->map_tmp_buf, map_size);
 
-        afl_shm_deinit(&afl->shm);
         afl_fsrv_kill(&afl->fsrv);
         afl_fsrv_kill(&afl->cmplog_fsrv);
+        afl_shm_deinit(&afl->shm);
         afl->cmplog_fsrv.map_size = new_map_size;  // non-cmplog stays the same
 
         afl->fsrv.trace_bits = afl_shm_init(&afl->shm, new_map_size,