diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-23 12:00:50 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-23 12:00:50 +0100 |
| commit | a93ce588620c82285a066d4bd819670b5b3aa38b (patch) | |
| tree | e68111a93742b9034946ed1259fac7abfb17c9f3 /win32 | |
| parent | 046dcfb531e242d36a7af2942b9b148290c3c7fe (diff) | |
| parent | ea3afcbae36c3f1f9003a506c6936a4681f1181d (diff) | |
| download | php-git-a93ce588620c82285a066d4bd819670b5b3aa38b.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable UBSan in addition to ASan
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32 | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 31a5eca0e0..a1aebb6603 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -327,7 +327,7 @@ if (CLANG_TOOLSET) { "-Wno-unused-command-line-argument -Wno-unused-function -Wno-ignored-pragma-optimize"); } - ARG_ENABLE("sanitizer", "Enable address sanitizer extension", "no"); + ARG_ENABLE("sanitizer", "Enable ASan and UBSan extensions", "no"); if (PHP_SANITIZER == "yes") { if (COMPILER_NUMERIC_VERSION < 500) { ERROR("Clang at least 5.0.0 required for sanitation plugins"); diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 9ca6d24177..9166cdeab6 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3692,7 +3692,7 @@ function add_asan_opts(cflags_name, libs_name, ldflags_name) } if (!!cflags_name) { - ADD_FLAG(cflags_name, "-fsanitize=address"); + ADD_FLAG(cflags_name, "-fsanitize=address,undefined"); } if (!!libs_name) { if (X64) { |