1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Validate the typed data before dereferencing the internal struct. (#8315)

Browse Source
This commit is contained in:
Samuel Williams 2023-08-29 20:04:14 +12:00 committed by GitHub
parent 141102b0b0
commit 901b6d9c50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-08-29 08:04:49 +00:00 
Merged-By: ioquatix <samuel@codeotaku.com>
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
process.c
View File

@ -1222,7 +1222,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;
@ -4748,7 +4748,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);

21
test/fiber/test_process.rb
View File

@ -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