diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-08-09 11:29:13 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-08-09 11:29:13 +0800 |
| commit | 307acb661856850371fb77fafcb4edb0c8f11bd9 (patch) | |
| tree | 954c50b2ccf36494a6b885e7ea0355d4bb106c48 | |
| parent | 42608a340152374328ff51eb02810c255e01937a (diff) | |
| parent | b06f8cb58bfb7310fff483cb739449e75cd90b79 (diff) | |
| download | php-git-307acb661856850371fb77fafcb4edb0c8f11bd9.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
| -rw-r--r-- | ext/spl/php_spl.c | 20 | ||||
| -rw-r--r-- | ext/spl/tests/bug75049.phpt | 16 |
2 files changed, 32 insertions, 4 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 38588907a1..8db63910cb 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -535,8 +535,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); @@ -654,8 +660,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); diff --git a/ext/spl/tests/bug75049.phpt b/ext/spl/tests/bug75049.phpt new file mode 100644 index 0000000000..2f03a3b031 --- /dev/null +++ b/ext/spl/tests/bug75049.phpt @@ -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 |