com php-src: Fixed bug #71202 (Autoload function registered by another not activated immediately): NEWS ext/spl/php_spl.c ext/spl/te sts/bug71202.phpt
| From: | Xinchen Hui | Date: | Wed, 23 Dec 2015 15:48:00 +0000 |
| Subject: | com php-src: Fixed bug #71202 (Autoload function registered by another not activated immediately): NEWS ext/spl/php_spl.c ext/spl/te sts/bug71202.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90416@lists.php.net to get a copy of this message | ||
Commit: e21cb2daeabe459db996407df2113bb47a320937
Author: Xinchen Hui <laruence@gmail.com> Wed, 23 Dec 2015 07:48:00 -0800
Parents: 72207b5436a5d0ad66003cf494e098f8c067550b
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e21cb2daeabe459db996407df2113bb47a320937
Log:
Fixed bug #71202 (Autoload function registered by another not activated immediately)
Bugs:
https://bugs.php.net/71202
Changed paths:
M NEWS
M ext/spl/php_spl.c
A ext/spl/tests/bug71202.phpt
Diff:
diff --git a/NEWS b/NEWS
index 4dd6361..50a6bbf 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ PHP NEWS
- Core:
. Added support for new HTTP 451 code. (Julien)
+- SPL:
+ . Fixed bug #71202 (Autoload function registered by another not activated
+ immediately). (Laruence)
+
- Standard:
.. Fixed bug #71190 (substr_replace converts integers in original $search
array to strings). (Laruence)
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index e89caa2..b2f5932 100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -417,11 +417,17 @@ PHP_FUNCTION(spl_autoload_call)
}
if (SPL_G(autoload_functions)) {
+ HashPosition pos;
+ zend_ulong num_idx;
int l_autoload_running = SPL_G(autoload_running);
SPL_G(autoload_running) = 1;
lc_name = zend_string_alloc(Z_STRLEN_P(class_name), 0);
zend_str_tolower_copy(ZSTR_VAL(lc_name), Z_STRVAL_P(class_name), Z_STRLEN_P(class_name));
- ZEND_HASH_FOREACH_STR_KEY_PTR(SPL_G(autoload_functions), func_name, alfi) {
+ zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), &pos);
+ while (zend_hash_get_current_key_ex(SPL_G(autoload_functions), &func_name, &num_idx,
&pos) == HASH_KEY_IS_STRING) {
+ if ((alfi = zend_hash_get_current_data_ptr_ex(SPL_G(autoload_functions), &pos)) == NULL) {
+ continue;
+ }
zend_call_method(Z_ISUNDEF(alfi->obj)? NULL : &alfi->obj, alfi->ce,
&alfi->func_ptr, ZSTR_VAL(func_name), ZSTR_LEN(func_name), retval, 1, class_name, NULL);
zend_exception_save();
if (retval) {
@@ -431,7 +437,8 @@ PHP_FUNCTION(spl_autoload_call)
if (zend_hash_exists(EG(class_table), lc_name)) {
break;
}
- } ZEND_HASH_FOREACH_END();
+ zend_hash_move_forward_ex(SPL_G(autoload_functions), &pos);
+ }
zend_exception_restore();
zend_string_free(lc_name);
SPL_G(autoload_running) = l_autoload_running;
diff --git a/ext/spl/tests/bug71202.phpt b/ext/spl/tests/bug71202.phpt
new file mode 100644
index 0000000..d26d7e1
--- /dev/null
+++ b/ext/spl/tests/bug71202.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Bug #71202 (Autoload function registered by another not activated immediately)
+--FILE--
+<?php
+
+function inner_autoload ($name){
+ if ($name == 'A') {
+ class A {
+ function __construct(){
+ echo "okey, ";
+ }
+ }
+ } else {
+ class B {
+ function __construct() {
+ die("error");
+ }
+ }
+ }
+}
+
+spl_autoload_register(function ($name) {
+ if ($name == 'A') {
+ spl_autoload_register("inner_autoload");
+ } else {
+ spl_autoload_unregister("inner_autoload");
+ }
+});
+
+$c = new A();
+try {
+ $c = new B();
+} catch (Error $e) {
+ echo "done";
+}
+?>
+--EXPECT--
+okey, done