diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-16 22:18:12 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-16 22:18:12 +0000 |
commit | c9165d06441fcb126d1d36a9b2fb123d404d2001 (patch) | |
tree | d5b96b635b9b3a7fe14f00a7660a7e1fd7146c7e | |
parent | e91e50d05eeb82ae6858b629f3e1d56a03503d79 (diff) | |
download | ruby-c9165d06441fcb126d1d36a9b2fb123d404d2001.tar.gz |
* marshal.c (r_object0): raise ArgumentError when linking to undefined
object.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 5 | ||||
-rw-r--r-- | test/ruby/test_marshal.rb | 12 |
3 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Mar 17 07:17:36 2016 Eric Hodel <drbrain@segment7.net> + + * marshal.c (r_object0): raise ArgumentError when linking to undefined + object. + Thu Mar 17 00:45:00 2016 Kenta Murata <mrkn@mrkn.jp> * test/ruby/test_bignum.rb: Make sure to use Bignum values in the tests. @@ -1965,6 +1965,11 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) rb_raise(rb_eArgError, "dump format error(0x%x)", type); break; } + + if (v == Qundef) { + rb_raise(rb_eArgError, "dump format error (bad link)"); + } + return v; } diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 3d7ce7d9e4..412039d106 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -725,4 +725,16 @@ class TestMarshal < Test::Unit::TestCase opt = %w[--disable=gems] assert_ruby_status(opt, "Marshal.load(#{crash.dump})") end + + def test_marshal_load_r_prepare_reference_crash + crash = "\x04\bI/\x05\x00\x06:\x06E{\x06@\x05T" + + opt = %w[--disable=gems] + assert_ruby_status(opt, <<-RUBY) +begin + Marshal.load(#{crash.dump}) +rescue ArgumentError +end + RUBY + end end |