derick Sun, 29 Jan 2012 15:25:40 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=322922
Log: - Reinstated correct return values after David's fix for #60218. Bug: https://bugs.php.net/60218 (Closed) instantiating unknown class leads to memory leak in cli Changed paths: U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c U php/php-src/trunk/Zend/zend_execute_API.c Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c =================================================================== --- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c 2012-01-29 11:17:07 UTC (rev 322921) +++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c 2012-01-29 15:25:40 UTC (rev 322922) @@ -1195,8 +1195,11 @@ } CG(interactive) = 0; + retval = SUCCESS; zend_try { - zend_execute(new_op_array TSRMLS_CC); + zend_execute(new_op_array TSRMLS_CC); + } zend_catch { + retval = FAILURE; } zend_end_try(); CG(interactive) = orig_interactive; @@ -1218,7 +1221,6 @@ destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); EG(return_value_ptr_ptr) = original_return_value_ptr_ptr; - retval = SUCCESS; } else { retval = FAILURE; } Modified: php/php-src/trunk/Zend/zend_execute_API.c =================================================================== --- php/php-src/trunk/Zend/zend_execute_API.c 2012-01-29 11:17:07 UTC (rev 322921) +++ php/php-src/trunk/Zend/zend_execute_API.c 2012-01-29 15:25:40 UTC (rev 322922) @@ -1195,8 +1195,11 @@ } CG(interactive) = 0; + retval = SUCCESS; zend_try { zend_execute(new_op_array TSRMLS_CC); + } zend_catch { + retval = FAILURE; } zend_end_try(); CG(interactive) = orig_interactive; @@ -1218,7 +1221,6 @@ destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); EG(return_value_ptr_ptr) = original_return_value_ptr_ptr; - retval = SUCCESS; } else { retval = FAILURE; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
