kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2016-03-14 18:36:14 +00:00
parent 4358ff468b
commit fa0e37646a
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Mar 15 03:35:04 2016 Eric Hodel <drbrain@segment7.net>
* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
Tue Mar 15 01:22:27 2016 Charles Oliver Nutter <headius@headius.com>
* test/ruby/test_rubyoptions.rb: make version matching support

2
marshal.c
View file

@ -1585,6 +1585,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{
VALUE path = r_unique(arg);
VALUE m = rb_path_to_class(path);
if (NIL_P(extmod)) extmod = rb_ary_tmp_new(0);
if (RB_TYPE_P(m, T_CLASS)) { /* prepended */
VALUE c;
@ -1604,7 +1605,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
}
else {
must_be_module(m, path);
if (NIL_P(extmod)) extmod = rb_ary_tmp_new(0);
rb_ary_push(extmod, m);
v = r_object0(arg, 0, extmod);

11
test/ruby/test_marshal.rb
View file

@ -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