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

merge revision(s) 56894: [Backport #12974]

Browse source 
marshal.c: fix infinite recursion

	* marshal.c (check_userdump_arg): marshal_dump should not return
  an instance of the same class, otherwise it causes infinite
  recursion.  [ruby-core:78289] [Bug #12974]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@57343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-01-16 19:08:08 +00:00
parent 3032b62d54
commit c6250c600e
3 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
marshal.c
View file

@ -178,8 +178,22 @@ check_dump_arg(VALUE ret, struct dump_arg *arg, const char *name)
}
return ret;
}
static VALUE
check_userdump_arg(VALUE obj, ID sym, int argc, const VALUE *argv,
struct dump_arg *arg, const char *name)
{
VALUE ret = rb_funcallv(obj, sym, argc, argv);
VALUE klass = CLASS_OF(obj);
if (CLASS_OF(ret) == klass) {
rb_raise(rb_eRuntimeError, "%"PRIsVALUE"#%s returned same class instance",
klass, name);
}
return check_dump_arg(ret, arg, name);
}
#define dump_funcall(arg, obj, sym, argc, argv) \
check_dump_arg(rb_funcallv(obj, sym, argc, argv), arg, name_##sym)
check_userdump_arg(obj, sym, argc, argv, arg, name_##sym)
#define dump_check_funcall(arg, obj, sym, argc, argv) \
check_dump_arg(rb_check_funcall(obj, sym, argc, argv), arg, name_##sym)

12
test/ruby/test_marshal.rb
View file

@ -736,4 +736,16 @@ class TestMarshal < Test::Unit::TestCase
end
RUBY
end
class Bug12974
def marshal_dump
dup
end
end
def test_marshal_dump_recursion
assert_raise_with_message(RuntimeError, /same class instance/) do
Marshal.dump(Bug12974.new)
end
end
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-01-17"
#define RUBY_PATCHLEVEL 227
#define RUBY_PATCHLEVEL 228
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 1