mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 13:03:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #48023 (spl_autoload_register didn't store closures)

Browse Source
This commit is contained in:
Etienne Kneuss 2009-04-20 14:18:46 +00:00
parent 573961e6f9
commit cdc6dcfc3c
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/spl/php_spl.c
View File

@ -337,6 +337,7 @@ PHP_FUNCTION(spl_autoload_extensions)
typedef struct {
zend_function *func_ptr;
zval *obj;
zval *closure;
zend_class_entry *ce;
} autoload_func_info;
@ -345,6 +346,9 @@ static void autoload_func_info_dtor(autoload_func_info *alfi)
if (alfi->obj) {
zval_ptr_dtor(&alfi->obj);
}
if (alfi->closure) {
zval_ptr_dtor(&alfi->closure);
}
}
/* {{{ proto void spl_autoload_call(string class_name) U
@ -485,9 +489,14 @@ PHP_FUNCTION(spl_autoload_register)
RETURN_FALSE;
}
}
alfi.closure = NULL;
alfi.ce = fcc.calling_scope;
alfi.func_ptr = fcc.function_handler;
obj_ptr = fcc.object_ptr;
if (Z_TYPE_P(zcallable) == IS_OBJECT) {
alfi.closure = zcallable;
Z_ADDREF_P(zcallable);
}
if (error) {
efree(error);
}
@ -531,6 +540,7 @@ PHP_FUNCTION(spl_autoload_register)
spl_alfi.func_ptr = spl_func_ptr;
spl_alfi.obj = NULL;
spl_alfi.ce = NULL;
spl_alfi.closure = NULL;
zend_hash_add(SPL_G(autoload_functions), "spl_autoload", sizeof("spl_autoload"), &spl_alfi, sizeof(autoload_func_info), NULL);
if (prepend && SPL_G(autoload_functions)->nNumOfElements > 1) {
/* Move the newly created element to the head of the hashtable */

12
ext/spl/tests/bug48023.phpt Normal file
View File

@ -0,0 +1,12 @@
--TEST--
Bug #48023 (spl_autoload_register didn't addref closures)
--FILE--
<?php
spl_autoload_register(function(){});
new Foo;
?>
===DONE===
--EXPECTF--
Fatal error: Class 'Foo' not found in %s on line %d