1 files changed, 5 insertions, 52 deletions
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index de41600b..5f286427 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -2087,6 +2087,7 @@ int main(int argc, char **argv_orig, char **envp) {
     afl->cmplog_fsrv.qemu_mode = afl->fsrv.qemu_mode;
     afl->cmplog_fsrv.frida_mode = afl->fsrv.frida_mode;
     afl->cmplog_fsrv.cmplog_binary = afl->cmplog_binary;
+    afl->cmplog_fsrv.target_path = afl->fsrv.target_path;
     afl->cmplog_fsrv.init_child_func = cmplog_exec_child;
 
     if ((map_size <= DEFAULT_SHMEM_SIZE ||
@@ -2216,8 +2217,8 @@ int main(int argc, char **argv_orig, char **envp) {
   cull_queue(afl);
 
   // ensure we have at least one seed that is not disabled.
-  u32 valid_seeds = 0;
-  for (u32 entry = 0; entry < afl->queued_items; ++entry)
+  u32 entry, valid_seeds = 0;
+  for (entry = 0; entry < afl->queued_items; ++entry)
     if (!afl->queue_buf[entry]->disabled) { ++valid_seeds; }
 
   if (!afl->pending_not_fuzzed || !valid_seeds) {
@@ -2247,7 +2248,7 @@ int main(int argc, char **argv_orig, char **envp) {
 
       u64 max_ms = 0;
 
-      for (u32 entry = 0; entry < afl->queued_items; ++entry)
+      for (entry = 0; entry < afl->queued_items; ++entry)
         if (!afl->queue_buf[entry]->disabled)
           if (afl->queue_buf[entry]->exec_us > max_ms)
             max_ms = afl->queue_buf[entry]->exec_us;
@@ -2291,7 +2292,7 @@ int main(int argc, char **argv_orig, char **envp) {
   #ifdef INTROSPECTION
   u32 prev_saved_crashes = 0, prev_saved_tmouts = 0;
   #endif
-  u32 skip_count = 0, prev_queued_items = 0, runs_in_current_cycle = (u32)-1;
+  u32 prev_queued_items = 0, runs_in_current_cycle = (u32)-1;
   u8  skipped_fuzz;
 
   #ifdef INTROSPECTION
@@ -2553,54 +2554,6 @@ int main(int argc, char **argv_orig, char **envp) {
       }
 
       skipped_fuzz = fuzz_one(afl);
-
-      if (unlikely(skipped_fuzz)) {
-
-        ++skip_count;
-
-        if (unlikely(skip_count > afl->active_items)) {
-
-          if (afl->active_items > 1 && !afl->old_seed_selection) {
-
-            u32 found = 0;
-            for (u32 i = 0; i < afl->queued_items; ++i) {
-
-              if (likely(!afl->queue_buf[i]->disabled &&
-                         afl->queue_buf[i]->perf_score == 0)) {
-
-                ++found;
-
-              }
-
-            }
-
-            if (found >= afl->active_items) {
-
-              // all active items have a perf_score of 0 ... damn
-              for (u32 i = 0; i < afl->queued_items; ++i) {
-
-                if (likely(!afl->queue_buf[i]->disabled)) {
-
-                  afl->queue_buf[i]->perf_score = afl->queue_buf[i]->weight;
-
-                }
-
-              }
-
-            }
-
-          }
-
-          skip_count = 0;
-
-        }
-
-      } else {
-
-        skip_count = 0;
-
-      }
-
   #ifdef INTROSPECTION
       ++afl->queue_cur->stats_selected;