From 7c2cfe5784c44c13bc628fd00306fba9598dfd6a Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 24 May 2008 13:29:07 +0000 Subject: * 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@16569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ marshal.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * marshal.c (marshal_load): should initialize arg.data used for + reentrant check. [ruby-dev:34837] + Sat May 24 00:34:59 2008 Tanaka Akira * 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); -- cgit v1.2.3