]> granicus.if.org Git - php/commitdiff
fix crash on exceptions when return value of the inside function is used
authorStanislav Malyshev <stas@php.net>
Fri, 30 May 2003 10:05:29 +0000 (10:05 +0000)
committerStanislav Malyshev <stas@php.net>
Fri, 30 May 2003 10:05:29 +0000 (10:05 +0000)
Zend/zend_execute.c

index 27a660577fc97e5b035c60b3f6a5858523d908fc..3aee58f3dcc9b44e3251479202f496ea8ca11562 100644 (file)
@@ -2704,7 +2704,7 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
        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) {