From 11afa4f4d07b1ef4139c1932b91bbcbfdf40c4e6 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 10 Jan 2006 10:50:17 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ gc.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9692664d48..0c4b6325e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jan 10 19:42:33 2006 Tanaka Akira + + * 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 * ext/syck/rubyext.c (syck_resolver_transfer): should be able to load diff --git a/gc.c b/gc.c index a05f8fd433..51f94d76ca 100644 --- a/gc.c +++ b/gc.c @@ -1313,6 +1313,8 @@ garbage_collect(void) 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);