2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c75065dd1a..2893323486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jan 10 19:42:33 2006  Tanaka Akira  <akr@m17n.org>
+
+	* gc.c (garbage_collect): mark ruby_current_node.
+	  if an exception is raised in a finalizer called by
+	  rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
+	  collected ruby_current_node and mark_source_filename may corrupt
+	  memory.
+
 Tue Jan 10 13:30:34 2006  akira yamada  <akira@ruby-lang.org>
 
 	* ext/syck/rubyext.c (syck_resolver_transfer): should be able to load
diff --git a/gc.c b/gc.c
index 5a2146b24c..65c858b3e4 100644
--- a/gc.c
+++ b/gc.c
@@ -1331,6 +1331,8 @@ garbage_collect()
 
     init_mark_stack();
 
+    gc_mark((VALUE)ruby_current_node, 0);
+
     /* mark frame stack */
     for (frame = ruby_frame; frame; frame = frame->prev) {
 	rb_gc_mark_frame(frame);