From 0b8ab5b0a86bb6039dee2ed31501c9d135ee2fed Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 4 Nov 2016 08:54:46 +0000 Subject: [PATCH] * gc.c (heap_page_resurrect): do not return tomb_pages when page->freelist == NULL. [Bug #12670] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ gc.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63e8998327..01c798ba82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 4 17:52:44 2016 Koichi Sasada + + * gc.c (heap_page_resurrect): do not return tomb_pages when + page->freelist == NULL. + [Bug #12670] + Fri Nov 4 16:31:45 2016 Nobuyoshi Nakada * util.c (ruby_dtoa): round to even, instead of rounding to diff --git a/gc.c b/gc.c index 1eb3f77fd8..9f1e2b3419 100644 --- a/gc.c +++ b/gc.c @@ -1550,12 +1550,16 @@ heap_page_allocate(rb_objspace_t *objspace) static struct heap_page * heap_page_resurrect(rb_objspace_t *objspace) { - struct heap_page *page; + struct heap_page *page = heap_tomb->pages; - if ((page = heap_tomb->pages) != NULL) { - heap_unlink_page(objspace, heap_tomb, page); - return page; + while (page) { + if (page->freelist != NULL) { + heap_unlink_page(objspace, heap_tomb, page); + return page; + } + page = page->next; } + return NULL; }