diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-11-27 19:01:23 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-11-27 19:01:23 +0000 |
| commit | 7d4fd3fd380a7fe9b497684775a38190786b93ba (patch) | |
| tree | 0ff7829b47dc4969052284b9ad9411c465bd424e /Zend/zend_interfaces.c | |
| parent | d741138a4639adb14cb31ea519ded0e0432c9e9a (diff) | |
| download | php-git-7d4fd3fd380a7fe9b497684775a38190786b93ba.tar.gz | |
Fixed bug #46409 (__invoke method called outside of object context when using array_map)
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rwxr-xr-x | Zend/zend_interfaces.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index e744ff413a..b4edac5aee 100755 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -46,7 +46,7 @@ ZEND_API zval* zend_call_method(zval **object_pp, zend_class_entry *obj_ce, zend fci.size = sizeof(fci); /*fci.function_table = NULL; will be read form zend_class_entry of object if needed */ - fci.object_pp = object_pp; + fci.object_ptr = object_pp ? *object_pp : NULL; fci.function_name = &z_fname; fci.retval_ptr_ptr = retval_ptr_ptr ? retval_ptr_ptr : &retval; fci.param_count = param_count; @@ -85,7 +85,7 @@ ZEND_API zval* zend_call_method(zval **object_pp, zend_class_entry *obj_ce, zend } fcic.calling_scope = obj_ce; fcic.called_scope = object_pp ? obj_ce : EG(called_scope); - fcic.object_pp = object_pp; + fcic.object_ptr = object_pp ? *object_pp : NULL; result = zend_call_function(&fci, &fcic TSRMLS_CC); } if (result == FAILURE) { |