2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28702394a2..53d964f96c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  8 13:19:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_thread_mark): mark stat_insn_usage only when ptr is not
+	  null.
+
 Thu May  8 10:44:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (sort_reentered): reentered check may be called from
diff --git a/vm.c b/vm.c
index 4be4371630..e3ad6260c1 100644
--- a/vm.c
+++ b/vm.c
@@ -1637,6 +1637,7 @@ rb_thread_mark(void *ptr)
 	RUBY_MARK_UNLESS_NULL(th->top_wrapper);
 	RUBY_MARK_UNLESS_NULL(th->fiber);
 	RUBY_MARK_UNLESS_NULL(th->root_fiber);
+	RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
 
 	rb_mark_tbl(th->local_storage);
 
@@ -1650,7 +1651,6 @@ rb_thread_mark(void *ptr)
 	mark_event_hooks(th->event_hooks);
     }
 
-    RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
     RUBY_MARK_LEAVE("thread");
 }