diff options
author | Stanislav Malyshev <stas@php.net> | 2011-01-16 21:24:43 +0000 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2011-01-16 21:24:43 +0000 |
commit | 0c1ba13d3b02d8aa72e8932429b099b0159a7e3f (patch) | |
tree | 5fd5ee9c22a3fcf2894b8fd532091c749f5f3f24 /Zend/zend_exceptions.c | |
parent | b4dba12d34072900027fd9f87d48c0044470daf1 (diff) | |
download | php-git-0c1ba13d3b02d8aa72e8932429b099b0159a7e3f.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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 28d2063031..0865815c95 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -106,6 +106,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"); } |