Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Handle null pointer in async_cb_dispatcher mark and free #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larskanis merged 2 commits into from
Sep 25, 2023
Merged

Handle null pointer in async_cb_dispatcher mark and free #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
031636c
Handle null pointer in async_cb_dispatcher mark and free
byroot Sep 25, 2023
97ce4ef
Add test case for #1050
larskanis Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ext/ffi_c/Function.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,18 @@ static void
async_cb_dispatcher_mark(void *ptr)
{
struct async_cb_dispatcher *ctx = (struct async_cb_dispatcher *)ptr;
rb_gc_mark(ctx->thread);
if (ctx) {
rb_gc_mark(ctx->thread);
}
}

static void
async_cb_dispatcher_free(void *ptr)
{
struct async_cb_dispatcher *ctx = (struct async_cb_dispatcher *)ptr;
xfree(ctx);
if (ctx) {
xfree(ctx);
}
}

struct rb_ractor_local_storage_type async_cb_dispatcher_key_type = {
Expand Down
9 changes: 9 additions & 0 deletions spec/ffi/fork_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,14 @@ def run_async_callback(libtest)

expect(Process.wait2[1].exitstatus).to eq(44)
end

it "GC doesn't crash when the dispatcher thread was stopped. #1050" do
FFI::Function.new(:int, [], proc{})
fork do
GC.start
Process.exit 45
end
expect(Process.wait2[1].exitstatus).to eq(45)
end
end
end