From: Bob Weinand <bobwei9@hotmail.com>
Date: Thu, 24 Sep 2015 19:06:07 +0000 (+0200)
Subject: Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE
X-Git-Tag: php-7.0.0RC4~4^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abf6a0b376b42e0ce60da039b11c6fdf994431fb;p=php

Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index daad1c120d..f0e7278459 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -7196,6 +7196,7 @@ ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY)
 		case ZEND_USER_OPCODE_ENTER:
 			ZEND_VM_ENTER();
 		case ZEND_USER_OPCODE_LEAVE:
+			LOAD_OPLINE();
 			ZEND_VM_LEAVE();
 		case ZEND_USER_OPCODE_DISPATCH:
 			ZEND_ASSERT(EX(opline) == opline);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ea01110d96..253a2d7a13 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1583,6 +1583,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_
 		case ZEND_USER_OPCODE_ENTER:
 			ZEND_VM_ENTER();
 		case ZEND_USER_OPCODE_LEAVE:
+			LOAD_OPLINE();
 			ZEND_VM_LEAVE();
 		case ZEND_USER_OPCODE_DISPATCH:
 			ZEND_ASSERT(EX(opline) == opline);