From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 20 May 2015 19:49:37 +0000 (+0300)
Subject: Fixed access to wrong opline (it may be the last ZEND_THROW in op_array->opcodes)
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e57aceed424db0b57e8e68d434cb7d624d99de27;p=php

Fixed access to wrong opline (it may be the last ZEND_THROW in op_array->opcodes)
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 023836e4f1..e8c0706cf0 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -125,7 +125,7 @@ ZEND_API void zend_throw_exception_internal(zval *exception) /* {{{ */
 
 	if (!EG(current_execute_data)->func ||
 	    !ZEND_USER_CODE(EG(current_execute_data)->func->common.type) ||
-	    (EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) {
+	    EG(current_execute_data)->opline->opcode == ZEND_HANDLE_EXCEPTION) {
 		/* no need to rethrow the exception */
 		return;
 	}