From 9a1effadba37bb18aece8a6d34141aaf857292bd Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 15 Jun 2008 14:18:43 +0000
Subject: 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
---
 marshal.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'marshal.c')

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);
-- 
cgit v1.2.3