From 264f4900123d5024141bd8d2e2210da9abc187e1 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 29 May 2010 15:10:01 +0000
Subject: * gc.c (force_chain_object, rb_objspace_call_finalizer): delete  
 finalizer entry after corresponding finalizer is executed.   This caused SEGV
 when test/cgi is executed with GC.stress = true.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 gc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gc.c')

diff --git a/gc.c b/gc.c
index e2a161cd7e..b0a6dcf6c0 100644
--- a/gc.c
+++ b/gc.c
@@ -2840,7 +2840,7 @@ force_chain_object(st_data_t key, st_data_t val, st_data_t arg)
     curr->table = val;
     curr->next = *prev;
     *prev = curr;
-    return ST_DELETE;
+    return ST_CONTINUE;
 }
 
 void
@@ -2873,6 +2873,7 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
 	    while (list) {
 		struct force_finalize_list *curr = list;
 		run_finalizer(objspace, curr->obj, rb_obj_id(curr->obj), curr->table);
+		st_delete(finalizer_table, (st_data_t*)&curr->obj, 0);
 		list = curr->next;
 		xfree(curr);
 	    }
-- 
cgit v1.2.3