diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-03-15 16:44:12 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-03-15 16:44:12 +0000 |
| commit | 79ed194a64a93275d680947f20d3da3e6875d548 (patch) | |
| tree | 376cfcd8f7114ac5913227ad844ec05566a8ed7b /Zend/zend.c | |
| parent | f6536ed2b23f3c5384ba9d89fa1ef5c48c6c129d (diff) | |
| download | php-git-79ed194a64a93275d680947f20d3da3e6875d548.tar.gz | |
fix #40815 (using strings like "class::func" and static methods in set_exception_handler() might result in crash)
Diffstat (limited to 'Zend/zend.c')
| -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 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); |