2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e87970f509..0fbb0abdc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 24 22:27:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (marshal_load): should initialize arg.data used for
+	  reentrant check.  [ruby-dev:34837]
+
 Sat May 24 00:34:59 2008  Tanaka Akira  <akr@fsij.org>
 
 	* lib/rational.rb (Rational#to_i): fix rdoc.  Rational(-7,4).to_i
diff --git a/marshal.c b/marshal.c
index 9dd83966a7..298f78ad86 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));
     }
 }
@@ -1431,6 +1431,7 @@ marshal_load(argc, argv)
     }
     arg.src = port;
     arg.offset = 0;
+    arg.data = 0;
 
     major = r_byte(&arg);
     minor = r_byte(&arg);