5 files changed, 6 insertions, 4 deletions
diff --git a/tools/ci/jobs/gcc5_sanitize_tests.sh b/tools/ci/jobs/gcc5_sanitize_tests.sh
index ef76291f4..35c671f21 100755
--- a/tools/ci/jobs/gcc5_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc5_sanitize_tests.sh
@@ -60,7 +60,7 @@ export CXXFLAGS="-ggdb3 -O2 -ffast-math \
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy
-export ASAN_OPTIONS=detect_leaks=0
+export ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=true:strict_init_order=true
 export LSAN_OPTIONS=suppressions=$(pwd)/tools/ci/scripts/lsansuppression_tests.txt
 run_make_check
 
diff --git a/tools/ci/jobs/gcc6_sanitize_tests.sh b/tools/ci/jobs/gcc6_sanitize_tests.sh
index 2ebd0e655..8f584e8eb 100755
--- a/tools/ci/jobs/gcc6_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc6_sanitize_tests.sh
@@ -34,7 +34,7 @@ export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
 do_init
 run_configure $*
 export SDL_VIDEODRIVER=dummy
-export ASAN_OPTIONS=detect_leaks=0
+export ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=true:strict_init_order=true
 export LSAN_OPTIONS=suppressions=$(pwd)/tools/ci/scripts/lsansuppression_tests.txt
 run_make_check
 
diff --git a/tools/ci/jobs/gcc7_sanitize_tests.sh b/tools/ci/jobs/gcc7_sanitize_tests.sh
index 371f27aa0..154b22c5b 100755
--- a/tools/ci/jobs/gcc7_sanitize_tests.sh
+++ b/tools/ci/jobs/gcc7_sanitize_tests.sh
@@ -34,7 +34,7 @@ export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy
-export ASAN_OPTIONS=detect_leaks=0
+export ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=true:strict_init_order=true
 export LSAN_OPTIONS=suppressions=$(pwd)/tools/ci/scripts/lsansuppression_tests.txt
 run_make_check
 
diff --git a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
index 172aa2c4a..d3da359c4 100755
--- a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
+++ b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh
@@ -39,7 +39,7 @@ export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
 do_init
 run_configure --enable-unittests=yes $*
 export SDL_VIDEODRIVER=dummy
-export ASAN_OPTIONS=detect_leaks=0
+export ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=true:strict_init_order=true
 export LSAN_OPTIONS=suppressions=$(pwd)/tools/ci/scripts/lsansuppression_tests.txt
 run_make_check
 
diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh
index 75a7570ba..90d3de2fa 100755
--- a/tools/ci/scripts/runtests.sh
+++ b/tools/ci/scripts/runtests.sh
@@ -14,6 +14,8 @@ sysctl -w kernel.core_pattern=core
 export HOME="logs/home"
 rm -rf $HOME
 
+export ASAN_OPTIONS=detect_stack_use_after_return=true:strict_init_order=true
+
 echo "clean config runs"
 n=0
 while true; do