summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-01-16 21:24:43 +0000
committerStanislav Malyshev <stas@php.net>2011-01-16 21:24:43 +0000
commitff4982784a53f02b08b1b2cade9dff6e46977eca (patch)
treea64319e7ad067aafb2631c26ec54c1dd8dcded14 /Zend/zend_exceptions.c
parent3a3f3696788c8af3ee19bade368197561fb7df78 (diff)
downloadphp-git-ff4982784a53f02b08b1b2cade9dff6e46977eca.tar.gz
Fix bug #47143, bug #51458 - provide more useful info in bad exception cases
Diffstat (limited to 'Zend/zend_exceptions.c')
-rw-r--r--Zend/zend_exceptions.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 261e3111b6..95ff0ab178 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -91,6 +91,9 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
}
}
if (!EG(current_execute_data)) {
+ if(EG(exception)) {
+ zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
+ }
zend_error(E_ERROR, "Exception thrown without a stack frame");
}