summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-04 08:54:46 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-04 08:54:46 +0000
commit0b8ab5b0a86bb6039dee2ed31501c9d135ee2fed (patch)
treee4a0955b0ca9ab6ea2d7b78a2cfd9155160f0550 /gc.c
parent6ed8c79ddb11ccfb580bb0a22b22cc1362250255 (diff)
* 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
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c12
1 files changed, 8 insertions, 4 deletions
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;
}