zend_timeout() may access EX(opline)

dstogov · dstogov · commit d31ccb5fc8a0 · 2020-04-17T14:55:14.000+03:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -8879,10 +8879,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
@@ -2054,10 +2054,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_FORWARD_SPEC_H
 static 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
`@@ -8879,10 +8879,10 @@ ZEND_VM_DEFINE_OP(137, ZEND_OP_DATA);`
`8879`	`8879`	`ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)`
`8880`	`8880`	`{`
`8881`	`8881`	`EG(vm_interrupt) = 0;`
	`8882`	`+ SAVE_OPLINE();`
`8882`	`8883`	`if (EG(timed_out)) {`
`8883`	`8884`	`zend_timeout(0);`
`8884`	`8885`	`} else if (zend_interrupt_function) {`
`8885`		`- SAVE_OPLINE();`
`8886`	`8886`	`zend_interrupt_function(execute_data);`
`8887`	`8887`	`ZEND_VM_ENTER();`
`8888`	`8888`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2054,10 +2054,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_FORWARD_SPEC_H`
`2054`	`2054`	`static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)`
`2055`	`2055`	`{`
`2056`	`2056`	`EG(vm_interrupt) = 0;`
	`2057`	`+ SAVE_OPLINE();`
`2057`	`2058`	`if (EG(timed_out)) {`
`2058`	`2059`	`zend_timeout(0);`
`2059`	`2060`	`} else if (zend_interrupt_function) {`
`2060`		`- SAVE_OPLINE();`
`2061`	`2061`	`zend_interrupt_function(execute_data);`
`2062`	`2062`	`ZEND_VM_ENTER();`
`2063`	`2063`	`}`