about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDominik Maier <domenukk@gmail.com>2020-03-28 11:55:10 +0100
committerDominik Maier <domenukk@gmail.com>2020-04-01 13:10:06 +0200
commitab5e0703dab404a77cd4726f720db99bed1a0c71 (patch)
treeaf02917d3857f49d804ecd5a1d29374ff62d4209 /src
parentf370ef38c47eb9243c5ca06b98948e33cf5347b3 (diff)
downloadafl++-ab5e0703dab404a77cd4726f720db99bed1a0c71.tar.gz
tiny changes in custom mut api
Diffstat (limited to 'src')
-rw-r--r--src/afl-fuzz-mutators.c2
-rw-r--r--src/afl-fuzz-one.c6
-rw-r--r--src/afl-fuzz-python.c2
-rw-r--r--src/afl-fuzz-run.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/afl-fuzz-mutators.c b/src/afl-fuzz-mutators.c
index 0692ebb0..f14a57bb 100644
--- a/src/afl-fuzz-mutators.c
+++ b/src/afl-fuzz-mutators.c
@@ -229,7 +229,7 @@ u8 trim_case_custom(afl_state_t *afl, struct queue_entry *q, u8 *in_buf) {
 
     size_t retlen = afl->mutator->afl_custom_trim(afl->mutator->data, &retbuf);
 
-    if (unlikely(retlen < 0 || !retbuf))
+    if (unlikely(!retbuf))
       FATAL("custom_trim failed (ret %zd)", retlen);
     else if (unlikely(retlen > orig_len))
       FATAL(
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c
index 8dfafb7b..b1bbad0a 100644
--- a/src/afl-fuzz-one.c
+++ b/src/afl-fuzz-one.c
@@ -1618,8 +1618,8 @@ custom_mutator_stage:
         afl->mutator->data, out_buf, len, &mutated_buf, new_buf, target->len,
         max_seed_size);
 
-    if (unlikely(mutated_size < 0))
-      FATAL("custom_fuzz returned %zd", mutated_size);
+    if (unlikely(!mutated_buf))
+      FATAL("Error in custom_fuzz. Size returned: %zd", mutated_size);
 
     if (mutated_size > len) afl->out_size = mutated_size;
 
@@ -1734,7 +1734,7 @@ havoc_stage:
         u8 *   custom_havoc_buf = NULL;
         size_t new_len = afl->mutator->afl_custom_havoc_mutation(
             afl->mutator->data, out_buf, temp_len, &custom_havoc_buf, MAX_FILE);
-        if (unlikely(new_len < 0))
+        if (unlikely(!custom_havoc_buf))
           FATAL("Error in custom_havoc (return %zd)", new_len);
         if (likely(new_len > 0 && custom_havoc_buf)) {
 
diff --git a/src/afl-fuzz-python.c b/src/afl-fuzz-python.c
index 6f8982c0..76b5ca80 100644
--- a/src/afl-fuzz-python.c
+++ b/src/afl-fuzz-python.c
@@ -103,7 +103,7 @@ size_t fuzz_py(void *py_mutator, u8 *buf, size_t buf_size, u8 **out_buf,
   } else {
 
     PyErr_Print();
-    FATAL("Call failed");
+    FATAL("python custom fuzz: call failed");
 
   }
 
diff --git a/src/afl-fuzz-run.c b/src/afl-fuzz-run.c
index 315539d1..90cb2ed5 100644
--- a/src/afl-fuzz-run.c
+++ b/src/afl-fuzz-run.c
@@ -221,7 +221,7 @@ void write_to_testcase(afl_state_t *afl, void *mem, u32 len) {
     size_t new_size = afl->mutator->afl_custom_pre_save(afl->mutator->data, mem,
                                                         len, &new_buf);
 
-    if (unlikely(new_size <= 0 || !new_buf))
+    if (unlikely(!new_buf))
       FATAL("Custom_pre_save failed (ret: %lu)", (long unsigned)new_size);
 
     /* everything as planned. use the new data. */