1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a1aacd5f5a..9022718162 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Sun Jun 15 23:13:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* parse.y (top_local_setup): fixed memory leak bug based on a
 	  patch from Roger Pack <rogerpack2005 at gmail.com> in
 	  [ruby-core:16610].
+Sun Jun 15 23:16:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (reentrant_check): check reentrance via callcc.
+	  [ruby-dev:34802]
+
 
 Sun Jun 15 23:09:00 2008  NAKAMURA Usaku  <usa@ruby-lang.org>