diff options
author | Sara Golemon <pollita@php.net> | 2014-02-20 12:10:40 -0800 |
---|---|---|
committer | Sara Golemon <pollita@php.net> | 2014-02-20 12:10:40 -0800 |
commit | d301c355402416f1d79d6c720943941a30381814 (patch) | |
tree | 4f635da8c36c30cb6ad09fa30f5efce6529cfeec /Zend/zend_object_handlers.c | |
parent | 7fab1a5790fbba5b186905ad2a12aa56d495fb16 (diff) | |
parent | 14c08ea362e5f16527b3d9772ddc75ca49cc22d7 (diff) | |
download | php-git-d301c355402416f1d79d6c720943941a30381814.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Add more tests for __debugInfo() and fix leak
Diffstat (limited to 'Zend/zend_object_handlers.c')
-rw-r--r-- | Zend/zend_object_handlers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index ed5256ee57..805454d70e 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -165,6 +165,7 @@ ZEND_API HashTable *zend_std_get_debug_info(zval *object, int *is_temp TSRMLS_DC zval ret; array_init(&ret); *is_temp = 1; + zval_ptr_dtor(&retval); return Z_ARRVAL(ret); } |