Interrupt while internal frame is on the stack

morrisonlevi · morrisonlevi · commit 12b9b766e830 · 2024-06-21T12:15:48.000-06:00
diff --git a/Zend/tests/fibers/signal-async.phpt b/Zend/tests/fibers/signal-async.phpt
@@ -30,8 +30,9 @@ Fiber start
 Fatal error: Uncaught FiberError: Cannot switch fibers in current execution context in %ssignal-async.php:%d
 Stack trace:
 #0 %ssignal-async.php(%d): Fiber::suspend()
-#1 %ssignal-async.php(%d): {closure:%s:%d}(%d, Array)
-#2 [internal function]: {closure:%s:%d}()
-#3 %ssignal-async.php(%d): Fiber->start()
-#4 {main}
+#1 [internal function]: {closure:%s:%d}(%d, Array)
+#2 %ssignal-async.php(%d): posix_kill(%d, %d)
+#3 [internal function]: {closure:%s:%d}()
+#4 %ssignal-async.php(%d): Fiber->start()
+#5 {main}
   thrown in %ssignal-async.php on line %d
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4015,6 +4015,14 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
 #endif
 	ZEND_OBSERVER_FCALL_END(call, EG(exception) ? NULL : ret);
 
+	if (UNEXPECTED(zend_atomic_bool_load_ex(&EG(vm_interrupt)))) {
+		if (zend_atomic_bool_load_ex(&EG(timed_out))) {
+			zend_timeout();
+		} else if (zend_interrupt_function) {
+			zend_interrupt_function(execute_data);
+		}
+	}
+
 	EG(current_execute_data) = execute_data;
 	zend_vm_stack_free_args(call);
 
@@ -4037,7 +4045,9 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL,OBSERVER))
 		HANDLE_EXCEPTION();
 	}
 
-	ZEND_VM_SET_OPCODE(opline + 1);
+	CHECK_SYMBOL_TABLES()
+	OPLINE = opline + 1;
+
 	ZEND_VM_CONTINUE();
 }
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
