Merge branch 'PHP-7.4'

dstogov · dstogov · commit 1a5a6d72a16a · 2020-04-17T14:56:18.000+03:00
* PHP-7.4:
  zend_timeout() may access EX(opline)
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -9202,10 +9202,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
@@ -2836,10 +2836,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
`@@ -9202,10 +9202,10 @@ ZEND_VM_DEFINE_OP(137, ZEND_OP_DATA);`
`9202`	`9202`	`ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)`
`9203`	`9203`	`{`
`9204`	`9204`	`EG(vm_interrupt) = 0;`
	`9205`	`+ SAVE_OPLINE();`
`9205`	`9206`	`if (EG(timed_out)) {`
`9206`	`9207`	`zend_timeout(0);`
`9207`	`9208`	`} else if (zend_interrupt_function) {`
`9208`		`- SAVE_OPLINE();`
`9209`	`9209`	`zend_interrupt_function(execute_data);`
`9210`	`9210`	`ZEND_VM_ENTER();`
`9211`	`9211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2836,10 +2836,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_FORWARD_SPEC_H`
`2836`	`2836`	`static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)`
`2837`	`2837`	`{`
`2838`	`2838`	`EG(vm_interrupt) = 0;`
	`2839`	`+ SAVE_OPLINE();`
`2839`	`2840`	`if (EG(timed_out)) {`
`2840`	`2841`	`zend_timeout(0);`
`2841`	`2842`	`} else if (zend_interrupt_function) {`
`2842`		`- SAVE_OPLINE();`
`2843`	`2843`	`zend_interrupt_function(execute_data);`
`2844`	`2844`	`ZEND_VM_ENTER();`
`2845`	`2845`	`}`