From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 7 Dec 2004 07:45:46 +0000 (+0000)
Subject: Fixed bug #30904 (segfault when recording soapclient into session).
X-Git-Tag: php-5.0.3RC2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac5f1552ff2881e2bd03d57569c21bdd41081538;p=php

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

diff --git a/NEWS b/NEWS
index f3a6a4fc17..d13f17387f 100644
--- 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 9c01a79abd..aca3349476 100644
--- 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;
 	}