From 57b9e18d71b50a707d4bc962d8ffabac0e83a18b Mon Sep 17 00:00:00 2001 From: mame Date: Fri, 1 Aug 2008 12:36:39 +0000 Subject: * gc.c (allocate_heaps, assign_heap_slot, rb_newobj_from_heap): reset during_gc before raising NoMemoryError. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gc.c') diff --git a/gc.c b/gc.c index 6b14d6745d..27fd988bd9 100644 --- a/gc.c +++ b/gc.c @@ -555,7 +555,10 @@ allocate_heaps(rb_objspace_t *objspace, size_t next_heaps_length) p = heaps = (struct heaps_slot *)malloc(size); } ); - if (p == 0) rb_memerror(); + if (p == 0) { + during_gc = 0; + rb_memerror(); + } heaps_length = next_heaps_length; } @@ -568,8 +571,10 @@ assign_heap_slot(rb_objspace_t *objspace) objs = HEAP_OBJ_LIMIT; RUBY_CRITICAL(p = (RVALUE*)malloc(HEAP_SIZE)); - if (p == 0) + if (p == 0) { + during_gc = 0; rb_memerror(); + } membase = p; if ((VALUE)p % sizeof(RVALUE) != 0) { @@ -663,6 +668,7 @@ rb_newobj_from_heap(rb_objspace_t *objspace) if ((ruby_gc_stress && !ruby_disable_gc_stress) || !freelist) { if (!heaps_increment(objspace) && !garbage_collect(objspace)) { + during_gc = 0; rb_memerror(); } } -- cgit v1.2.3