2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f615c7dd..5023a72f 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ endif
 
 ifdef ASAN_BUILD
   $(info Compiling ASAN version of binaries)
-  CFLAGS+=-fsanitize=address -fstack-protector-strong
+  CFLAGS+=-fsanitize=address -fstack-protector-strong -D_ASAN_BUILD=1
   LDFLAGS+=-fsanitize=address -fstack-protector-strong
 endif
 
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index 617a42ec..64644b64 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -721,6 +721,13 @@ int main(int argc, char **argv_orig, char **envp) {
 
   }
 
+#ifdef _ASAN_BUILD
+  if (!afl->fsrv.mem_limit) {
+    WARNF("in the ASAN build we disable all memory limits");
+    afl->fsrv.mem_limit = 0;
+  }
+#endif
+
   setup_signal_handlers();
   check_asan_opts();