diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-01 19:42:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-01 19:42:53 +0800 |
| commit | d196ac6a48448d654f478192970e07c6bae3e051 (patch) | |
| tree | 950ff4063ce08656c278d896d6f6d8bab1517e44 /ext/spl/spl_iterators.c | |
| parent | f4a235c541c5d94c88217e1b6707943b7e30cb5a (diff) | |
| parent | f41ab36e5cd6a2e41ca13d1bd8ee922c42e5bb27 (diff) | |
| download | php-git-d196ac6a48448d654f478192970e07c6bae3e051.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/spl/spl_iterators.c')
| -rw-r--r-- | ext/spl/spl_iterators.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 3068ccc795..b9901f8f27 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -848,6 +848,8 @@ static union _zend_function *spl_recursive_it_get_method(zval **object_ptr, char *object_ptr = zobj; function_handler = Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, method_len, key TSRMLS_CC); } + } else { + *object_ptr = zobj; } } return function_handler; |