diff options
| author | Dmitry Stogov <dmitry@php.net> | 2008-09-19 12:48:33 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2008-09-19 12:48:33 +0000 |
| commit | b6a4094c030c74561b94b2c8004d969719e42d3e (patch) | |
| tree | 74f58ac9bc14d33d281878ba17ec8416a16e5347 /ext/spl/spl_array.c | |
| parent | bf20aa12c7ab21e1dbd30e242bb5beb1dde3cc8a (diff) | |
| download | php-git-b6a4094c030c74561b94b2c8004d969719e42d3e.tar.gz | |
Fixed bug #46115 (Memory leak when calling a method using Reflection)
Diffstat (limited to 'ext/spl/spl_array.c')
| -rwxr-xr-x | ext/spl/spl_array.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 14a6553258..fd1fb0759b 100755 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1235,6 +1235,7 @@ static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, char *fname, int fnam spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC); HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC); zval *tmp, *arg; + zval *retval_ptr = NULL; MAKE_STD_ZVAL(tmp); Z_TYPE_P(tmp) = IS_ARRAY; @@ -1245,12 +1246,15 @@ static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, char *fname, int fnam zend_throw_exception(spl_ce_BadMethodCallException, "Function expects exactly one argument", 0 TSRMLS_CC); return; } - zend_call_method(NULL, NULL, NULL, fname, fname_len, return_value_ptr, 2, tmp, arg TSRMLS_CC); + zend_call_method(NULL, NULL, NULL, fname, fname_len, &retval_ptr, 2, tmp, arg TSRMLS_CC); } else { - zend_call_method(NULL, NULL, NULL, fname, fname_len, return_value_ptr, 1, tmp, NULL TSRMLS_CC); + zend_call_method(NULL, NULL, NULL, fname, fname_len, &retval_ptr, 1, tmp, NULL TSRMLS_CC); } Z_TYPE_P(tmp) = IS_NULL; /* we want to destroy the zval, not the hashtable */ zval_ptr_dtor(&tmp); + if (retval_ptr) { + COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr); + } } /* }}} */ #define SPL_ARRAY_METHOD(cname, fname, use_arg) \ |