mirror of
https://github.com/ruby/ruby.git
synced 2025-09-16 00:54:01 +02:00
merge revision(s) e1bd45624c
: [Backport #19482]
Fix crash when allocating classes with newobj hook We need to zero out the whole slot when running the newobj hook for a newly allocated class because the slot could be filled with garbage, which would cause a crash if a GC runs inside of the newobj hook. For example, the following script crashes: ``` require "objspace" GC.stress = true ObjectSpace.trace_object_allocations { 100.times do Class.new end } ``` [Bug #19482] --- gc.c | 8 +++++++- test/objspace/test_objspace.rb | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
This commit is contained in:
parent
44a8e5e63a
commit
141402d11c
3 changed files with 15 additions and 2 deletions
8
gc.c
8
gc.c
|
@ -2796,6 +2796,12 @@ newobj_alloc(rb_objspace_t *objspace, rb_ractor_t *cr, size_t size_pool_idx, boo
|
|||
return obj;
|
||||
}
|
||||
|
||||
static void
|
||||
newobj_zero_slot(VALUE obj)
|
||||
{
|
||||
memset((char *)obj + sizeof(struct RBasic), 0, rb_gc_obj_slot_size(obj) - sizeof(struct RBasic));
|
||||
}
|
||||
|
||||
ALWAYS_INLINE(static VALUE newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *cr, int wb_protected, size_t size_pool_idx));
|
||||
|
||||
static inline VALUE
|
||||
|
@ -2826,7 +2832,7 @@ newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *
|
|||
#endif
|
||||
newobj_init(klass, flags, wb_protected, objspace, obj);
|
||||
|
||||
gc_event_hook_prep(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj, newobj_fill(obj, 0, 0, 0));
|
||||
gc_event_hook_prep(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj, newobj_zero_slot(obj));
|
||||
}
|
||||
RB_VM_LOCK_LEAVE_CR_LEV(cr, &lev);
|
||||
|
||||
|
|
|
@ -216,6 +216,13 @@ class TestObjSpace < Test::Unit::TestCase
|
|||
assert_equal(c3, ObjectSpace.allocation_generation(o3))
|
||||
assert_equal(self.class.name, ObjectSpace.allocation_class_path(o3))
|
||||
assert_equal(__method__, ObjectSpace.allocation_method_id(o3))
|
||||
|
||||
# [Bug #19482]
|
||||
EnvUtil.under_gc_stress do
|
||||
100.times do
|
||||
Class.new
|
||||
end
|
||||
end
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -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 67
|
||||
#define RUBY_PATCHLEVEL 68
|
||||
|
||||
#include "ruby/version.h"
|
||||
#include "ruby/internal/abi.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue