summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-13 02:09:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-13 02:09:33 +0000
commit29f982738e0703c316ff124f66e92791c13f2376 (patch)
tree037b9095984649fc69663891d7d97571e8c48a2b
parent17ccd5d013fa7ffd612aea4c9babdfb37fec213d (diff)
* gc.c (vm_xrealloc): use the given object space.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c4
2 files changed, 6 insertions, 2 deletions
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 <nobu@ruby-lang.org>
+
+ * gc.c (vm_xrealloc): use the given object space.
+
Fri Nov 13 00:46:24 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* 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);
}