From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 17 Apr 2020 11:56:01 +0000 (+0300)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.7RC1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2376be81ddd8b3401acde47443744a50c25a4bb;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  zend_timeout() may access EX(opline)
---

b2376be81ddd8b3401acde47443744a50c25a4bb
diff --cc Zend/zend_vm_execute.h
index 2fce1be298,a84cfe3d4b..559edd070c
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -2874,9 -2051,10 +2874,10 @@@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_
  	ZEND_VM_CONTINUE();
  }
  
 -static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
 +static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
  {
  	EG(vm_interrupt) = 0;
+ 	SAVE_OPLINE();
  	if (EG(timed_out)) {
  		zend_timeout(0);
  	} else if (zend_interrupt_function) {