1 files changed, 2 insertions, 52 deletions
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c
index ef2fa904..89d01460 100644
--- a/src/afl-forkserver.c
+++ b/src/afl-forkserver.c
@@ -688,58 +688,8 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
 
     if (!getenv("LD_BIND_LAZY")) { setenv("LD_BIND_NOW", "1", 1); }
 
-    /* Set sane defaults for ASAN if nothing else is specified. */
-    u8 *have_asan_options = getenv("ASAN_OPTIONS");
-    u8 *have_ubsan_options = getenv("UBSAN_OPTIONS");
-    u8 *have_msan_options = getenv("MSAN_OPTIONS");
-    u8 *have_lsan_options = getenv("LSAN_OPTIONS");
-    u8  have_san_options = 0;
-    if (have_asan_options || have_ubsan_options || have_msan_options ||
-        have_lsan_options)
-      have_san_options = 1;
-    u8 default_options[1024] =
-        "detect_odr_violation=0:abort_on_error=1:symbolize=0:malloc_context_"
-        "size=0:allocator_may_return_null=1:handle_segv=0:handle_sigbus=0:"
-        "handle_abort=0:handle_sigfpe=0:handle_sigill=0:";
-
-    if (!have_lsan_options) strcat(default_options, "detect_leaks=0:");
-
-    /* Set sane defaults for ASAN if nothing else is specified. */
-
-    if (!have_san_options) setenv("ASAN_OPTIONS", default_options, 1);
-
-    /* Set sane defaults for UBSAN if nothing else is specified. */
-
-    if (!have_san_options) setenv("UBSAN_OPTIONS", default_options, 1);
-
-    /* MSAN is tricky, because it doesn't support abort_on_error=1 at this
-       point. So, we do this in a very hacky way. */
-
-    if (!have_msan_options) {
-
-      u8 buf[2048] = "";
-      if (!have_san_options) strcpy(buf, default_options);
-      strcat(buf, "exit_code=" STRINGIFY(MSAN_ERROR) ":msan_track_origins=0:");
-      setenv("MSAN_OPTIONS", buf, 1);
-
-    }
-
-    /* LSAN, too, does not support abort_on_error=1. (is this still true??) */
-
-    if (!have_lsan_options) {
-
-      u8 buf[2048] = "";
-      if (!have_san_options) strcpy(buf, default_options);
-      strcat(buf,
-             "exitcode=" STRINGIFY(
-                 LSAN_ERROR) ":fast_unwind_on_malloc=0:print_suppressions=0:");
-      setenv("LSAN_OPTIONS", buf, 1);
-
-    }
-
-    /* Envs for QASan */
-    setenv("QASAN_MAX_CALL_STACK", "0", 0);
-    setenv("QASAN_SYMBOLIZE", "0", 0);
+    /* Set sane defaults for sanitizers */
+    set_sanitizer_defaults();
 
     fsrv->init_child_func(fsrv, argv);