Skip to content

Commit 986b9b5

Browse files
committed
Add additional no_sanitize_address attributes
To fix bug #77447 in release mode as well.
1 parent 14b5302 commit 986b9b5

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

ext/standard/base64.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t lengt
216216
PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length) __attribute__((ifunc("resolve_base64_encode")));
217217
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) __attribute__((ifunc("resolve_base64_decode")));
218218

219+
ZEND_NO_SANITIZE_ADDRESS
219220
static void *resolve_base64_encode() {
220221
# if ZEND_INTRIN_AVX2_FUNC_PROTO
221222
if (zend_cpu_supports_avx2()) {
@@ -230,6 +231,7 @@ static void *resolve_base64_encode() {
230231
return php_base64_encode_default;
231232
}
232233

234+
ZEND_NO_SANITIZE_ADDRESS
233235
static void *resolve_base64_decode() {
234236
# if ZEND_INTRIN_AVX2_FUNC_PROTO
235237
if (zend_cpu_supports_avx2()) {

ext/standard/string.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3903,13 +3903,15 @@ void php_stripslashes_default(zend_string *str);
39033903
PHPAPI zend_string *php_addslashes(zend_string *str) __attribute__((ifunc("resolve_addslashes")));
39043904
PHPAPI void php_stripslashes(zend_string *str) __attribute__((ifunc("resolve_stripslashes")));
39053905

3906+
ZEND_NO_SANITIZE_ADDRESS
39063907
static void *resolve_addslashes() {
39073908
if (zend_cpu_supports_sse42()) {
39083909
return php_addslashes_sse42;
39093910
}
39103911
return php_addslashes_default;
39113912
}
39123913

3914+
ZEND_NO_SANITIZE_ADDRESS
39133915
static void *resolve_stripslashes() {
39143916
if (zend_cpu_supports_sse42()) {
39153917
return php_stripslashes_sse42;

0 commit comments

Comments
 (0)