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

Crash when malloc during GC

Browse Source 
This feature was introduced in commit 2ccf6e5, but I realized that
using rb_warn is a bad idea because it allocates objects, which causes
a different crash ("object allocation during garbage collection phase").
We should just hard crash here instead.
This commit is contained in:
Peter Zhu 2023-03-03 16:23:43 -05:00
parent 755c379d87
commit a1758fbd7f
Notes: git 2023-03-06 14:09:22 +00:00 
Merged: https://github.com/ruby/ruby/pull/7441
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gc.c
View File

@ -12354,18 +12354,23 @@ objspace_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
} \ } \
} while (0) } while (0)
static void
check_malloc_not_in_gc(rb_objspace_t *objspace, const char *msg)
{
if (UNLIKELY(malloc_during_gc_p(objspace))) {
dont_gc_on();
during_gc = false;
rb_bug("Cannot %s during GC", msg);
}
}
/* these shouldn't be called directly. /* these shouldn't be called directly.
* objspace_* functions do not check allocation size. * objspace_* functions do not check allocation size.
*/ */
static void * static void *
objspace_xmalloc0(rb_objspace_t *objspace, size_t size) objspace_xmalloc0(rb_objspace_t *objspace, size_t size)
{ {
if (UNLIKELY(malloc_during_gc_p(objspace))) { check_malloc_not_in_gc(objspace, "malloc");
rb_warn("malloc during GC detected, this could cause crashes if it triggers another GC");
#if RGENGC_CHECK_MODE || RUBY_DEBUG
rb_bug("Cannot malloc during GC");
#endif
}
void *mem; void *mem;
@ -12384,12 +12389,7 @@ xmalloc2_size(const size_t count, const size_t elsize)
static void * static void *
objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t old_size) objspace_xrealloc(rb_objspace_t *objspace, void *ptr, size_t new_size, size_t old_size)
{ {
if (UNLIKELY(malloc_during_gc_p(objspace))) { check_malloc_not_in_gc(objspace, "realloc");
rb_warn("realloc during GC detected, this could cause crashes if it triggers another GC");
#if RGENGC_CHECK_MODE || RUBY_DEBUG
rb_bug("Cannot realloc during GC");
#endif
}
void *mem; void *mem;