diff --git a/ChangeLog b/ChangeLog index 49a4c09820..882bd5b282 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Nov 13 11:09:31 2009 Nobuyoshi Nakada + + * gc.c (vm_xrealloc): use the given object space. + Fri Nov 13 00:46:24 2009 Takeyuki FUJIOKA * lib/cgi/util.rb (CGI::pretty): fix the overflow bug diff --git a/gc.c b/gc.c index 77111011e6..f472bfc734 100644 --- a/gc.c +++ b/gc.c @@ -683,7 +683,7 @@ vm_xrealloc(rb_objspace_t *objspace, void *ptr, size_t size) if ((ssize_t)size < 0) { negative_size_allocation_error("negative re-allocation size"); } - if (!ptr) return ruby_xmalloc(size); + if (!ptr) return vm_xmalloc(objspace, size); if (size == 0) { vm_xfree(objspace, ptr); return 0; @@ -776,7 +776,7 @@ void ruby_xfree(void *x) { if (x) - vm_xfree(&rb_objspace, x); + vm_xfree(&rb_objspace, x); }