diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-08-09 11:29:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-08-09 11:29:46 +0800 |
| commit | e7dd9c781b7ea4e428b479a4dd9de2ca93259f2d (patch) | |
| tree | 4e953a614fd91a73444450f00a596be210b917a1 | |
| parent | 823ca5c6975895b2b25698d14a1ff6b544ab5f84 (diff) | |
| parent | 46ecda76ba2989957c9f6d049d76d6e668918d12 (diff) | |
| download | php-git-e7dd9c781b7ea4e428b479a4dd9de2ca93259f2d.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
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 d5b0c42f65..1097a72e98 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -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); 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 |