diff options
| -rw-r--r-- | process.c | 5 | ||||
| -rw-r--r-- | test/fiber/test_process.rb | 21 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 25 insertions, 3 deletions
@@ -1436,7 +1436,7 @@ rb_waitpid(rb_pid_t pid, int *st, int flags) VALUE status = rb_process_status_wait(pid, flags); if (NIL_P(status)) return 0; - struct rb_process_status *data = RTYPEDDATA_DATA(status); + struct rb_process_status *data = rb_check_typeddata(status, &rb_process_status_type); pid = data->pid; if (st) *st = data->status; @@ -4853,7 +4853,8 @@ rb_f_system(int argc, VALUE *argv, VALUE _) if (pid > 0) { VALUE status = rb_process_status_wait(pid, 0); - struct rb_process_status *data = RTYPEDDATA_DATA(status); + + struct rb_process_status *data = rb_check_typeddata(status, &rb_process_status_type); // Set the last status: rb_obj_freeze(status); diff --git a/test/fiber/test_process.rb b/test/fiber/test_process.rb index a5990be204..cc1694576e 100644 --- a/test/fiber/test_process.rb +++ b/test/fiber/test_process.rb @@ -34,6 +34,27 @@ class TestFiberProcess < Test::Unit::TestCase end.join end + def test_system_faulty_process_wait + Thread.new do + scheduler = Scheduler.new + + def scheduler.process_wait(pid, flags) + Fiber.blocking{Process.wait(pid, flags)} + + # Don't return `Process::Status` instance. + return false + end + + Fiber.set_scheduler scheduler + + Fiber.schedule do + assert_raise TypeError do + system("true") + end + end + end.join + end + def test_fork omit 'fork not supported' unless Process.respond_to?(:fork) Thread.new do @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 2 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 116 +#define RUBY_PATCHLEVEL 117 #include "ruby/version.h" #include "ruby/internal/abi.h" |