php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.1' into PHP-7.2

Browse Source 
* PHP-7.1:
  Update NEWS
  Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
This commit is contained in:
Xinchen Hui
2017-08-09 11:29:46 +08:00
parent 823ca5c697 46ecda76ba
commit e7dd9c781b
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/spl/php_spl.c
+16 -4
View File
@@ -564,8 +564,14 @@ PHP_FUNCTION(spl_autoload_register)
ZSTR_VAL(lc_name)[ZSTR_LEN(lc_name)] = '\0';
} else {
ZVAL_UNDEF(&alfi.closure);
lc_name = zend_string_alloc(ZSTR_LEN(func_name), 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), ZSTR_VAL(func_name), ZSTR_LEN(func_name));
/* Skip leading \ */
if (ZSTR_VAL(func_name)[0] == '\\') {
lc_name = zend_string_alloc(ZSTR_LEN(func_name) - 1, 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), ZSTR_VAL(func_name) + 1, ZSTR_LEN(func_name) - 1);
} else {
lc_name = zend_string_alloc(ZSTR_LEN(func_name), 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), ZSTR_VAL(func_name), ZSTR_LEN(func_name));
}
}
zend_string_release(func_name);
@@ -683,8 +689,14 @@ PHP_FUNCTION(spl_autoload_unregister)
memcpy(ZSTR_VAL(lc_name) + ZSTR_LEN(func_name), &Z_OBJ_HANDLE_P(zcallable), sizeof(uint32_t));
ZSTR_VAL(lc_name)[ZSTR_LEN(lc_name)] = '\0';
} else {
lc_name = zend_string_alloc(ZSTR_LEN(func_name), 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), ZSTR_VAL(func_name), ZSTR_LEN(func_name));
/* Skip leading \ */
if (ZSTR_VAL(func_name)[0] == '\\') {
lc_name = zend_string_alloc(ZSTR_LEN(func_name) - 1, 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), ZSTR_VAL(func_name) + 1, ZSTR_LEN(func_name) - 1);
} else {
lc_name = zend_string_alloc(ZSTR_LEN(func_name), 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), ZSTR_VAL(func_name), ZSTR_LEN(func_name));
}
}
zend_string_release(func_name);
ext/spl/tests/bug75049.phpt
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
--FILE--
<?php
class Auto { public static function loader() {}}
$autoloader = '\Auto::loader';
echo (int)spl_autoload_register($autoloader);
echo (int)spl_autoload_unregister($autoloader);
echo (int)spl_autoload_register($autoloader);
foreach (spl_autoload_functions() as $loader) {
echo (int)spl_autoload_unregister($loader);
}
echo (int)count(spl_autoload_functions());
--EXPECTF--
11110