fix

2 files changed, 11 insertions, 12 deletions

diff --git a/custom_mutators/autotokens/autotokens.cpp b/custom_mutators/autotokens/autotokens.cpp
index 0a010f0b..548e1be9 100644
--- a/custom_mutators/autotokens/autotokens.cpp
+++ b/custom_mutators/autotokens/autotokens.cpp
@@ -451,7 +451,7 @@ extern "C" unsigned char afl_custom_queue_get(void                *data,
 
       s = NULL;
       DEBUGF(stderr, "cmplog not ascii or only_fav and not favorite\n");
-      return 0;
+      return 1;
 
     }
 
@@ -532,7 +532,7 @@ extern "C" unsigned char afl_custom_queue_get(void                *data,
     if (!fp) {
 
       s = NULL;
-      return 0;
+      return 1;
 
     }  // should not happen
 
@@ -545,7 +545,7 @@ extern "C" unsigned char afl_custom_queue_get(void                *data,
       file_mapping[fn] = structure;  // NULL ptr so we don't read the file again
       s = NULL;
       DEBUGF(stderr, "Too short (%lu) %s\n", len, filename);
-      return 0;
+      return 1;
 
     }
 
@@ -557,7 +557,7 @@ extern "C" unsigned char afl_custom_queue_get(void                *data,
 
       s = NULL;
       DEBUGF(stderr, "Too short read %s\n", filename);
-      return 0;
+      return 1;
 
     }
 
@@ -581,7 +581,7 @@ extern "C" unsigned char afl_custom_queue_get(void                *data,
         file_mapping[fn] = NULL;
         s = NULL;
         DEBUGF(stderr, "Not text (%lu) %s\n", len, filename);
-        return 0;
+        return 1;
 
       }
 
@@ -982,7 +982,7 @@ extern "C" unsigned char afl_custom_queue_get(void                *data,
       file_mapping[fn] = NULL;
       s = NULL;
       DEBUGF(stderr, "too few tokens\n");
-      return 0;
+      return 1;
 
     }
 
@@ -1020,15 +1020,13 @@ extern "C" unsigned char afl_custom_queue_get(void                *data,
     DEBUGF(stderr, "DONE! We have %lu tokens in the structure\n",
            structure->size());
 
-  }
-
-  else {
+  } else {
 
     if (entry->second == NULL) {
 
       DEBUGF(stderr, "Skipping %s\n", filename);
       s = NULL;
-      return 0;
+      return 1;
 
     }
 
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c
index b25398c4..2f016217 100644
--- a/src/afl-fuzz-one.c
+++ b/src/afl-fuzz-one.c
@@ -1988,7 +1988,8 @@ custom_mutator_stage:
 
           if (unlikely(!mutated_buf)) {
 
-            FATAL("Error in custom_fuzz. Size returned: %zu", mutated_size);
+            //FATAL("Error in custom_fuzz. Size returned: %zu", mutated_size);
+            break;
 
           }
 
@@ -2040,7 +2041,7 @@ custom_mutator_stage:
   new_hit_cnt = afl->queued_items + afl->saved_crashes;
 
   afl->stage_finds[STAGE_CUSTOM_MUTATOR] += new_hit_cnt - orig_hit_cnt;
-  afl->stage_cycles[STAGE_CUSTOM_MUTATOR] += afl->stage_max;
+  afl->stage_cycles[STAGE_CUSTOM_MUTATOR] += afl->stage_cur;
 #ifdef INTROSPECTION
   afl->queue_cur->stats_mutated += afl->stage_max;
 #endif