svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
| From: | David Soria Parra | Date: | Sat, 12 Nov 2011 17:05:08 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66956@lists.php.net to get a copy of this message | ||
dsp Sat, 12 Nov 2011 17:05:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319102
Log:
Fix #60218 (instantiating unknown class leads to memory leak in cli)
Bug: https://bugs.php.net/60218 (error getting bug
information)
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 2011-11-12 16:32:10 UTC (rev 319101)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c 2011-11-12 17:05:08 UTC (rev 319102)
@@ -1195,7 +1195,9 @@
}
CG(interactive) = 0;
- zend_execute(new_op_array TSRMLS_CC);
+ zend_try {
+ zend_execute(new_op_array TSRMLS_CC);
+ } zend_end_try();
CG(interactive) = orig_interactive;
if (local_retval_ptr) {
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute_API.c 2011-11-12 16:32:10 UTC (rev 319101)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2011-11-12 17:05:08 UTC (rev 319102)
@@ -1195,7 +1195,9 @@
}
CG(interactive) = 0;
- zend_execute(new_op_array TSRMLS_CC);
+ zend_try {
+ zend_execute(new_op_array TSRMLS_CC);
+ } zend_end_try();
CG(interactive) = orig_interactive;
if (local_retval_ptr) {