Merge branch 'PHP-7.3' into PHP-7.4

dstogov · dstogov · commit b2376be81ddd · 2020-04-17T14:56:01.000+03:00
* PHP-7.3:
  zend_timeout() may access EX(opline)
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -9387,10 +9387,10 @@ ZEND_VM_DEFINE_OP(137, ZEND_OP_DATA);
 ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)
 {
 	EG(vm_interrupt) = 0;
+	SAVE_OPLINE();
 	if (EG(timed_out)) {
 		zend_timeout(0);
 	} else if (zend_interrupt_function) {
-		SAVE_OPLINE();
 		zend_interrupt_function(execute_data);
 		ZEND_VM_ENTER();
 	}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -2877,10 +2877,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_FORWARD_SPEC_H
 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) {
-		SAVE_OPLINE();
 		zend_interrupt_function(execute_data);
 		ZEND_VM_ENTER();
 	}

Original file line number	Diff line number	Diff line change
`@@ -9387,10 +9387,10 @@ ZEND_VM_DEFINE_OP(137, ZEND_OP_DATA);`
`9387`	`9387`	`ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)`
`9388`	`9388`	`{`
`9389`	`9389`	`EG(vm_interrupt) = 0;`
	`9390`	`+ SAVE_OPLINE();`
`9390`	`9391`	`if (EG(timed_out)) {`
`9391`	`9392`	`zend_timeout(0);`
`9392`	`9393`	`} else if (zend_interrupt_function) {`
`9393`		`- SAVE_OPLINE();`
`9394`	`9394`	`zend_interrupt_function(execute_data);`
`9395`	`9395`	`ZEND_VM_ENTER();`
`9396`	`9396`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2877,10 +2877,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_FORWARD_SPEC_H`
`2877`	`2877`	`static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)`
`2878`	`2878`	`{`
`2879`	`2879`	`EG(vm_interrupt) = 0;`
	`2880`	`+ SAVE_OPLINE();`
`2880`	`2881`	`if (EG(timed_out)) {`
`2881`	`2882`	`zend_timeout(0);`
`2882`	`2883`	`} else if (zend_interrupt_function) {`
`2883`		`- SAVE_OPLINE();`
`2884`	`2884`	`zend_interrupt_function(execute_data);`
`2885`	`2885`	`ZEND_VM_ENTER();`
`2886`	`2886`	`}`