From 4c17014bf3e49f480a2a5018e9cd4d855bece432 Mon Sep 17 00:00:00 2001 From: mame Date: Mon, 15 Nov 2010 15:09:40 +0000 Subject: [PATCH] * gc.c (assign_heap_slot): fix fear of memory leak and memory violation. Coverity Scan found this bug. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ gc.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 717588978a..9d58f3eaf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 16 00:07:32 2010 Yusuke Endoh + + * gc.c (assign_heap_slot): fix fear of memory leak and memory + violation. Coverity Scan found this bug. + Mon Nov 15 23:54:45 2010 Yusuke Endoh * eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add diff --git a/gc.c b/gc.c index b8c8c36684..cf9107ab8e 100644 --- a/gc.c +++ b/gc.c @@ -924,13 +924,17 @@ assign_heap_slot(rb_objspace_t *objspace) objs = HEAP_OBJ_LIMIT; p = (RVALUE*)malloc(HEAP_SIZE); - slot = (struct heaps_slot *)malloc(sizeof(struct heaps_slot)); - MEMZERO((void*)slot, struct heaps_slot, 1); - - if (p == 0 || slot == 0) { + if (p == 0) { during_gc = 0; rb_memerror(); } + slot = (struct heaps_slot *)malloc(sizeof(struct heaps_slot)); + if (slot == 0) { + xfree(p); + during_gc = 0; + rb_memerror(); + } + MEMZERO((void*)slot, struct heaps_slot, 1); slot->next = heaps; if (heaps) heaps->prev = slot;