diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-24 13:29:07 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-24 13:29:07 +0000 |
| commit | 7c2cfe5784c44c13bc628fd00306fba9598dfd6a (patch) | |
| tree | f09e4eabb59b886a65f76a165970f229fe2412c7 | |
| parent | f513d9ab286be1638dbf5f3cee6b6b9d606ba250 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | marshal.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat May 24 22:27:44 2008 Yukihiro Matsumoto <[email protected]> + + * marshal.c (marshal_load): should initialize arg.data used for + reentrant check. [ruby-dev:34837] + Sat May 24 00:34:59 2008 Tanaka Akira <[email protected]> * lib/rational.rb (Rational#to_i): fix rdoc. Rational(-7,4).to_i @@ -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); |