From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 18 Jan 2019 14:01:51 +0000 (+0100)
Subject: Add additional no_sanitize_address attributes
X-Git-Tag: php-7.3.2RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=986b9b5ae3e04e33fda89f102da1bba625aa06ef;p=php

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 fb6d491acf..d07fa990f6 100644
--- 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 3d3d886dd3..37e8d8c3e4 100644
--- 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;