merge revision(s) 16569:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9022718162..a48da8bd71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 23:18:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (marshal_load): should initialize arg.data used for
+	  reentrant check.  [ruby-dev:34837]
+
 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
diff --git a/marshal.c b/marshal.c
index 0c991fab98..d714f65122 100644
--- a/marshal.c
+++ b/marshal.c
@@ -89,7 +89,7 @@ reentrant_check(obj, sym)
     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 @@ marshal_load(argc, argv)
     }
     arg.src = port;
     arg.offset = 0;
+    arg.data = 0;
 
     major = r_byte(&arg);
     minor = r_byte(&arg);
diff --git a/version.h b/version.h
index 5c307a6f18..d2dd08d855 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 214
+#define RUBY_PATCHLEVEL 215
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8