Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit a93ce588620c · 2020-01-23T12:00:50.000+01:00
* PHP-7.4:
  Enable UBSan in addition to ASan
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ if (CLANG_TOOLSET) {`
`327`	`327`	`"-Wno-unused-command-line-argument -Wno-unused-function -Wno-ignored-pragma-optimize");`
`328`	`328`	`}`
`329`	`329`
`330`		`- ARG_ENABLE("sanitizer", "Enable address sanitizer extension", "no");`
	`330`	`+ ARG_ENABLE("sanitizer", "Enable ASan and UBSan extensions", "no");`
`331`	`331`	`if (PHP_SANITIZER == "yes") {`
`332`	`332`	`if (COMPILER_NUMERIC_VERSION < 500) {`
`333`	`333`	`ERROR("Clang at least 5.0.0 required for sanitation plugins");`
Original file line number	Diff line number	Diff line change
`@@ -3692,7 +3692,7 @@ function add_asan_opts(cflags_name, libs_name, ldflags_name)`
`3692`	`3692`	`}`
`3693`	`3693`
`3694`	`3694`	`if (!!cflags_name) {`
`3695`		`- ADD_FLAG(cflags_name, "-fsanitize=address");`
	`3695`	`+ ADD_FLAG(cflags_name, "-fsanitize=address,undefined");`
`3696`	`3696`	`}`
`3697`	`3697`	`if (!!libs_name) {`
`3698`	`3698`	`if (X64) {`