Commit: b548d9ad2e02f3f216320b5f47e26046021a5bac Author: Xinchen Hui <larue...@php.net> Fri, 1 Jun 2012 15:00:02 +0800 Parents: 5ebb0e520f4c31d09d9e5acd323162eca3fee0e3 1f5327a6022fedc1985d2daa6d189313d808b08b Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b548d9ad2e02f3f216320b5f47e26046021a5bac Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant) Bugs: https://bugs.php.net/62202 Changed paths: MM ext/reflection/php_reflection.c Diff: diff --cc ext/reflection/php_reflection.c index 1cf65ce,ca90269..9346587 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@@ -2559,9 -2418,10 +2559,10 @@@ ZEND_METHOD(reflection_parameter, getDe return; } - *return_value = precv->op2.u.constant; + *return_value = *precv->op2.zv; INIT_PZVAL(return_value); - if (Z_TYPE_P(return_value) != IS_CONSTANT && Z_TYPE_P(return_value) != IS_CONSTANT_ARRAY) { + if ((Z_TYPE_P(return_value) & IS_CONSTANT_TYPE_MASK) != IS_CONSTANT + && (Z_TYPE_P(return_value) & IS_CONSTANT_TYPE_MASK) != IS_CONSTANT_ARRAY) { zval_copy_ctor(return_value); } zval_update_constant_ex(&return_value, (void*)0, param->fptr->common.scope TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
