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  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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;
 }