Add additional no_sanitize_address attributes

To fix bug #77447 in release mode as well.

diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index fb6d491acfec0b6c2944fb8f6382ec3d04f471d1..d07fa990f645ec53357042a4ea43e01deef9fa88 100644 (file)
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -216,6 +216,7 @@ zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t lengt
 PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length) __attribute__((ifunc("resolve_base64_encode")));
 PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) __attribute__((ifunc("resolve_base64_decode")));
 
+ZEND_NO_SANITIZE_ADDRESS
 static void *resolve_base64_encode() {
 # if ZEND_INTRIN_AVX2_FUNC_PROTO
        if (zend_cpu_supports_avx2()) {
@@ -230,6 +231,7 @@ static void *resolve_base64_encode() {
        return php_base64_encode_default;
 }
 
+ZEND_NO_SANITIZE_ADDRESS
 static void *resolve_base64_decode() {
 # if ZEND_INTRIN_AVX2_FUNC_PROTO
        if (zend_cpu_supports_avx2()) {

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 3d3d886dd31a1939a4bf753b73f11aa7b54dec6f..37e8d8c3e4290e746cc0a2c02116a545c365c8e4 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -3903,6 +3903,7 @@ void php_stripslashes_default(zend_string *str);
 PHPAPI zend_string *php_addslashes(zend_string *str) __attribute__((ifunc("resolve_addslashes")));
 PHPAPI void php_stripslashes(zend_string *str) __attribute__((ifunc("resolve_stripslashes")));
 
+ZEND_NO_SANITIZE_ADDRESS
 static void *resolve_addslashes() {
        if (zend_cpu_supports_sse42()) {
                return php_addslashes_sse42;
@@ -3910,6 +3911,7 @@ static void *resolve_addslashes() {
        return  php_addslashes_default;
 }
 
+ZEND_NO_SANITIZE_ADDRESS
 static void *resolve_stripslashes() {
        if (zend_cpu_supports_sse42()) {
                return php_stripslashes_sse42;