summaryrefslogtreecommitdiff
path: root/Zend/zend.c
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend.c')
-rw-r--r--Zend/zend.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index 87342e2a46..88601eab4e 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1146,6 +1146,9 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
zval_ptr_dtor(&retval2);
}
} else {
+ if (!EG(exception)) {
+ EG(exception) = old_exception;
+ }
zend_exception_error(EG(exception) TSRMLS_CC);
}
efree(params);