rb_io_blocking_operation_exit should not execute with pending interrupts.

ioquatix · ioquatix · commit 5bccd0668ddd · 2025-05-24T20:35:54.000+09:00
diff --git a/internal/io.h b/internal/io.h
@@ -25,7 +25,7 @@ struct rb_io_blocking_operation {
     // The linked list data structure.
     struct ccan_list_node list;
 
-    // The execution context of the blocking operation:
+    // The execution context of the blocking operation.
     struct rb_execution_context_struct *ec;
 };
 
diff --git a/thread.c b/thread.c
@@ -1930,6 +1930,9 @@ rb_thread_io_blocking_call(struct rb_io* io, rb_blocking_function_t *func, void
                 RUBY_VM_CHECK_INTS_BLOCKING(ec);
                 goto retry;
             }
+
+            RUBY_VM_CHECK_INTS_BLOCKING(ec);
+
             state = saved_state;
         }
         EC_POP_TAG();
@@ -1944,9 +1947,6 @@ rb_thread_io_blocking_call(struct rb_io* io, rb_blocking_function_t *func, void
         EC_JUMP_TAG(ec, state);
     }
 
-    /* TODO: check func() */
-    RUBY_VM_CHECK_INTS_BLOCKING(ec);
-
     // If the error was a timeout, we raise a specific exception for that:
     if (saved_errno == ETIMEDOUT) {
         rb_raise(rb_eIOTimeoutError, "Blocking operation timed out!");
@@ -2768,7 +2768,6 @@ thread_io_close_notify_all(VALUE _io)
     struct rb_io_blocking_operation *blocking_operation;
     ccan_list_for_each(rb_io_blocking_operations(io), blocking_operation, list) {
         rb_execution_context_t *ec = blocking_operation->ec;
-
         rb_thread_t *thread = ec->thread_ptr;
 
         if (thread->scheduler != Qnil) {
@@ -2814,7 +2813,6 @@ void
 rb_thread_io_close_wait(struct rb_io* io)
 {
     VALUE wakeup_mutex = io->wakeup_mutex;
-
     if (!RB_TEST(wakeup_mutex)) {
         // There was nobody else using this file when we closed it, so we never bothered to allocate a mutex:
         return;
