diff options
| author | Dmitry Stogov <dmitry@php.net> | 2004-12-07 07:46:12 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2004-12-07 07:46:12 +0000 |
| commit | 5b18b931d07c57ca59a45c28ed2f305dda23619f (patch) | |
| tree | ca03c478972079b57215aecd3bfb97d7ef6d8815 /Zend | |
| parent | e32da28bd506fe5f19295783e5d4031f0ff95f27 (diff) | |
| download | php-git-5b18b931d07c57ca59a45c28ed2f305dda23619f.tar.gz | |
Fixed bug #30904 (segfault when recording soapclient into session).
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 5d3c005637..a270d2b27c 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -51,7 +51,8 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) zend_throw_exception_hook(exception TSRMLS_CC); } - if ((EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) { + if (EG(current_execute_data)->opline == NULL || + (EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) { /* no need to rethrow the exception */ return; } |