diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-18 15:03:00 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-18 15:03:00 +0100 |
| commit | 1bc86bcdd8e18c7b7dbda2082c1d5a738d9ddeb1 (patch) | |
| tree | 1c01c52a3e241757f58e94d0e823c33ef8ab2d10 /ext/standard | |
| parent | 345936aeb182d85b8a09be401ed1e9e6c955f6f3 (diff) | |
| parent | 986b9b5ae3e04e33fda89f102da1bba625aa06ef (diff) | |
| download | php-git-1bc86bcdd8e18c7b7dbda2082c1d5a738d9ddeb1.tar.gz | |
Merge branch 'PHP-7.3'
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/base64.c | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/base64.c b/ext/standard/base64.c index c750c7a0b9..21eca83237 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 3839512ecc..d9c5e6b10e 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3900,6 +3900,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; @@ -3907,6 +3908,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; |