cvs: ZendEngine2 / zend_execute.c
| From: | Stanislav Malyshev | Date: | Fri, 30 May 2003 10:05:29 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-1284@lists.php.net to get a copy of this message | ||
stas Fri May 30 06:05:29 2003 EDT
Modified files:
/ZendEngine2 zend_execute.c
Log:
fix crash on exceptions when return value of the inside function is used
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.466 ZendEngine2/zend_execute.c:1.467
--- ZendEngine2/zend_execute.c:1.466 Wed May 28 16:42:40 2003
+++ ZendEngine2/zend_execute.c Fri May 30 06:05:29 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.466 2003/05/28 20:42:40 sterling Exp $ */
+/* $Id: zend_execute.c,v 1.467 2003/05/30 10:05:29 stas Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -2704,7 +2704,7 @@
zend_ptr_stack_clear_multiple(TSRMLS_C);
if (EG(exception)) {
- if (return_value_used) {
+ if (return_value_used && EX_T(EX(opline)->result.u.var).var.ptr) {
zval_ptr_dtor(&EX_T(EX(opline)->result.u.var).var.ptr);
}
if (EX(opline)->op2.u.opline_num == -1) {