Fixed bug #30904 (segfault when recording soapclient into session).

diff --git a/NEWS b/NEWS
index f3a6a4fc17843923de419e66ea7d29d30df04ccb..d13f17387fb66c097565c2af6a68ac500231e3e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP                                                                        NEWS
 - Fixed bug #30967 (properties in extended mysqli classes don't work). (Georg)
 - Fixed bug #30922 (reflective functions crash PHP when interfaces extend
   themselves). (Tony, Dmitry)
+- Fixed bug #30904 (segfault when recording soapclient into session). (Tony,
+  Dmitry)
 - Fixed bug #30890 (MySQLi testsuite)
 - Fixed bug #30856 (ReflectionClass::getStaticProperties segfaults). (Marcus)
 - Fixed bug #30832 ("!" stripped off comments in xml parser). (Rob)

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 9c01a79abd4ea6541610dc050b15567418c7981d..aca3349476ac736cd9abe86edbc5bb7d6f9496a9 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -50,7 +50,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;
        }