merges r28073 from trunk into ruby_1_9_2.

--
* 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/branches/ruby_1_9_2@28077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 1 deletions

diff --git a/gc.c b/gc.c
index 43f28100f4..e7239690ce 100644
--- a/gc.c
+++ b/gc.c
@@ -2661,7 +2661,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
@@ -2694,6 +2694,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);
 	    }