archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3'

Browse source
This commit is contained in:
Nikita Popov 2019-01-18 15:03:00 +01:00
commit 1bc86bcdd8
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/base64.c
View file

@ -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()) {

2
ext/standard/string.c
View file

@ -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;