about summary refs log tree commit diff
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/afl++-keep-all-crashes.patch17
-rw-r--r--patches/jasper-no-define-int-types.patch19
2 files changed, 28 insertions, 8 deletions
diff --git a/patches/afl++-keep-all-crashes.patch b/patches/afl++-keep-all-crashes.patch
index e3ce8f6..2b1f57d 100644
--- a/patches/afl++-keep-all-crashes.patch
+++ b/patches/afl++-keep-all-crashes.patch
@@ -1,16 +1,16 @@
 diff --git a/src/afl-fuzz-bitmap.c b/src/afl-fuzz-bitmap.c
-index f05bb7db59d5..de275e374ff1 100644
+index 19cdf511149f..dd7cb510b62c 100644
 --- a/src/afl-fuzz-bitmap.c
 +++ b/src/afl-fuzz-bitmap.c
-@@ -556,7 +556,6 @@ save_if_interesting(afl_state_t *afl, void *mem, u32 len, u8 fault, u8 inc) {
-     if (likely(!new_bits && !new_paths)) {
+@@ -639,7 +639,6 @@ u8 __attribute__((hot)) save_if_interesting(afl_state_t *afl, void *mem,
+       if (san_fault == FSRV_RUN_OK) {
  
-       if (unlikely(afl->crash_mode)) { ++afl->total_crashes; }
--      return 0;
+         if (unlikely(afl->crash_mode)) { ++afl->total_crashes; }
+-        return 0;
  
-     }
+       } else {
  
-@@ -837,16 +836,12 @@ save_if_interesting(afl_state_t *afl, void *mem, u32 len, u8 fault, u8 inc) {
+@@ -934,8 +933,6 @@ may_save_fault:
  
        ++afl->total_crashes;
  
@@ -18,7 +18,8 @@ index f05bb7db59d5..de275e374ff1 100644
 -
        if (likely(!afl->non_instrumented_mode)) {
  
-         if (!classified) { classify_counts(&afl->fsrv); }
+         if (unlikely(!classified)) {
+@@ -947,8 +944,6 @@ may_save_fault:
  
          simplify_trace(afl, afl->fsrv.trace_bits);
  
diff --git a/patches/jasper-no-define-int-types.patch b/patches/jasper-no-define-int-types.patch
new file mode 100644
index 0000000..d6a5b0a
--- /dev/null
+++ b/patches/jasper-no-define-int-types.patch
@@ -0,0 +1,19 @@
+--- a/src/libjasper/include/jasper/jas_config.h.in
++++ b/src/libjasper/include/jasper/jas_config.h.in
+@@ -152,6 +152,7 @@
+ #undef inline
+ #endif
+ 
++#if 0
+ /* Define to `long long' if <sys/types.h> does not define. */
+ #undef longlong
+ 
+@@ -175,7 +176,7 @@
+ 
+ /* Define to `unsigned short' if <sys/types.h> does not define. */
+ #undef ushort
+-
++#endif
+ 
+ #else
+ /* A configure-based build is not being used. */