diff options
| author | van Hauser <vh@thc.org> | 2023-01-27 11:46:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 11:46:59 +0100 |
| commit | 3e8a691a81c08c174467e3d7ae04328a4d6be29e (patch) | |
| tree | dcb91017e71b3390e8387d7295ee13012dba344b /utils/afl_network_proxy/afl-network-server.c | |
| parent | 3b6fcd911a860a8c823c912c4b08b423734e4cfe (diff) | |
| parent | 33eba1fc5652060e8d877b02135fce2325813d0c (diff) | |
| download | afl++-3e8a691a81c08c174467e3d7ae04328a4d6be29e.tar.gz | |
Merge pull request #1627 from AFLplusplus/dev
push to stable
Diffstat (limited to 'utils/afl_network_proxy/afl-network-server.c')
| -rw-r--r-- | utils/afl_network_proxy/afl-network-server.c | 17 |
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")) { |