diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-03-15 16:42:51 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-03-15 16:42:51 +0000 |
| commit | 99def5cac2c48a0cb866d056f46739a283b308cc (patch) | |
| tree | 43b99ce1500a239710f998b1ab8339602e36a698 | |
| parent | 677bdadcdc01117f21223461b01abdbb9f0d465c (diff) | |
| download | php-git-99def5cac2c48a0cb866d056f46739a283b308cc.tar.gz | |
reset the exception if it's still NULL
| -rw-r--r-- | Zend/zend.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 5dbd7e0cc8..f88c0dc851 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1643,6 +1643,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); |