aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-14 18:36:14 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-14 18:36:14 +0000
commitfa0e37646ad58f1f4d5c70e6d5bf566a0f51fbf4 (patch)
treef66a6b36d6cb8dc3001489c3b86a34d6657fe88e /test
parent4358ff468b7dae1910dd8c112f9d947a620ef03c (diff)
downloadruby-fa0e37646ad58f1f4d5c70e6d5bf566a0f51fbf4.tar.gz
* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_marshal.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb
index 8377de2155..49a8511e8e 100644
--- a/test/ruby/test_marshal.rb
+++ b/test/ruby/test_marshal.rb
@@ -718,4 +718,15 @@ class TestMarshal < Test::Unit::TestCase
obj = [str, str]
assert_equal(['X', 'X'], Marshal.load(Marshal.dump(obj), ->(v) { v == str ? v.upcase : v }))
end
+
+ def test_marshal_load_extended_class_crash
+ crash = "\x04\be:\x0F\x00omparableo:\vObject\x00"
+
+ opt = %w[--disable=gems]
+ args = [opt, "Marshal.load(#{crash.dump})", true, true]
+ out, err, status = EnvUtil.invoke_ruby(*args)
+
+ assert_empty err
+ assert_predicate(status, :success?)
+ end
end