shyouhei	2008-06-15 23:17:57 +0900 (Sun, 15 Jun 2008)

  New Revision: 17321

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/marshal.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16569:
    * marshal.c (marshal_load): should initialize arg.data used for
      reentrant check.  [ruby-dev:34837]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/marshal.c?r1=17321&r2=17320&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17321&r2=17320&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17321&r2=17320&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17320)
+++ ruby_1_8_5/ChangeLog	(revision 17321)
@@ -1,3 +1,8 @@
+Sun Jun 15 23:17:34 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* marshal.c (marshal_load): should initialize arg.data used for
+	  reentrant check.  [ruby-dev:34837]
+
 Sun Jun 15 23:12:02 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* parse.y (top_local_setup): fixed memory leak bug based on a
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17320)
+++ ruby_1_8_5/version.h	(revision 17321)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 213
+#define RUBY_PATCHLEVEL 214
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/marshal.c
===================================================================
--- ruby_1_8_5/marshal.c	(revision 17320)
+++ ruby_1_8_5/marshal.c	(revision 17321)
@@ -89,7 +89,7 @@
     VALUE obj;
     ID sym;
 {
-    if (RBASIC(obj)->klass) {
+    if (obj && RBASIC(obj)->klass) {
         rb_raise(rb_eRuntimeError, "%s reentered", rb_id2name(sym));
     }
 }
@@ -1434,6 +1434,7 @@
     }
     arg.src = port;
     arg.offset = 0;
+    arg.data = 0;
 
     major = r_byte(&arg);
     minor = r_byte(&arg);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/