about summary refs log tree commit diff
path: root/utils/afl_network_proxy/afl-network-server.c
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2023-01-27 13:40:48 +0100
committerGitHub <noreply@github.com>2023-01-27 13:40:48 +0100
commit4a54555a1a73dd6be4f494ef67155ed41a81f0f4 (patch)
treedc29dd420c9d1d0f071447c91c0a0ab85780ad05 /utils/afl_network_proxy/afl-network-server.c
parent1b4e1d75b32c6024765ab27b36591ae97cb33f6b (diff)
parent33eba1fc5652060e8d877b02135fce2325813d0c (diff)
downloadafl++-4a54555a1a73dd6be4f494ef67155ed41a81f0f4.tar.gz
Merge pull request #1628 from AFLplusplus/dev
Dev
Diffstat (limited to 'utils/afl_network_proxy/afl-network-server.c')
-rw-r--r--utils/afl_network_proxy/afl-network-server.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/utils/afl_network_proxy/afl-network-server.c b/utils/afl_network_proxy/afl-network-server.c
index 2ae4c165..04309ada 100644
--- a/utils/afl_network_proxy/afl-network-server.c
+++ b/utils/afl_network_proxy/afl-network-server.c
@@ -194,7 +194,7 @@ static void set_up_environment(afl_forkserver_t *fsrv) {
 
     }
 
-    if (!strstr(x, "symbolize=0")) {
+    if (!getenv("AFL_DEBUG") && !strstr(x, "symbolize=0")) {
 
       FATAL("Custom ASAN_OPTIONS set without symbolize=0 - please fix!");
 
@@ -213,7 +213,7 @@ static void set_up_environment(afl_forkserver_t *fsrv) {
 
     }
 
-    if (!strstr(x, "symbolize=0")) {
+    if (!getenv("AFL_DEBUG") && !strstr(x, "symbolize=0")) {
 
       FATAL("Custom MSAN_OPTIONS set without symbolize=0 - please fix!");
 
@@ -221,18 +221,7 @@ static void set_up_environment(afl_forkserver_t *fsrv) {
 
   }
 
-  setenv("ASAN_OPTIONS",
-         "abort_on_error=1:"
-         "detect_leaks=0:"
-         "symbolize=0:"
-         "allocator_may_return_null=1",
-         0);
-
-  setenv("MSAN_OPTIONS", "exit_code=" STRINGIFY(MSAN_ERROR) ":"
-                         "symbolize=0:"
-                         "abort_on_error=1:"
-                         "allocator_may_return_null=1:"
-                         "msan_track_origins=0", 0);
+  set_sanitizer_defaults();
 
   if (get_afl_env("AFL_PRELOAD")) {