From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 7 Jul 2020 09:34:43 +0000 (+0200)
Subject: Assert no exception if using NEXT_OPCODE()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b48bd671b86116c9a9f2183a3975d763fc4d9505;p=php

Assert no exception if using NEXT_OPCODE()

When NEXT_OPCODE() is used instead of NEXT_OPCODE_CHECK_EXCEPTION(),
assert that there is indeed no exception.
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 4efb80bc72..fcd2a437e6 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -4319,6 +4319,7 @@ static zend_always_inline zend_execute_data *_zend_vm_stack_push_call_frame(uint
 	if (check_exception) { \
 		OPLINE = EX(opline) + (skip); \
 	} else { \
+		ZEND_ASSERT(!EG(exception)); \
 		OPLINE = opline + (skip); \
 	} \
 	ZEND_VM_CONTINUE()