archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #46409 (__invoke method called outside of object context when using array_map)

Browse source
This commit is contained in:
Dmitry Stogov 2008-11-27 19:01:23 +00:00
parent d741138a46
commit 7d4fd3fd38
29 changed files with 148 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/sqlite/sqlite.c
View file

@ -2415,7 +2415,7 @@ PHP_FUNCTION(sqlite_fetch_object)
fci.function_table = &ce->function_table;
fci.function_name = NULL;
fci.symbol_table = NULL;
fci.object_pp = &return_value;
fci.object_ptr = return_value;
fci.retval_ptr_ptr = &retval_ptr;
if (ctor_params && Z_TYPE_P(ctor_params) != IS_NULL) {
if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
@ -2449,7 +2449,7 @@ PHP_FUNCTION(sqlite_fetch_object)
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
fcc.called_scope = Z_OBJCE_P(return_value);
fcc.object_pp = &return_value;
fcc.object_ptr = return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
zend_throw_exception_ex(sqlite_ce_exception, 0 TSRMLS_CC, "Could not execute %s::%s()", class_name, ce->constructor->common.function_name);