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) 57024: [Backport #13015]

Browse source 
vm.c: check type of hash to merge

	* vm.c (core_hash_merge): check the type of the target hash to
	  merge.  [ruby-core:78536] [Bug #13015]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-03-25 18:13:17 +00:00
parent d014f463cf
commit d410184643
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
test/ruby/test_keyword.rb
View file

@ -615,4 +615,24 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_equal(x, result) assert_equal(x, result)
assert_kind_of(klass, result, bug12884) assert_kind_of(klass, result, bug12884)
end end
def test_kwrest_overwritten
bug13015 = '[ruby-core:78536] [Bug #13015]'
klass = EnvUtil.labeled_class("Parent") do
def initialize(d:)
end
end
klass = EnvUtil.labeled_class("Child", klass) do
def initialize(d:, **h)
h = [2, 3]
super
end
end
assert_raise_with_message(TypeError, /expected Hash/, bug13015) do
klass.new(d: 4)
end
end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26" #define RUBY_RELEASE_DATE "2017-03-26"
#define RUBY_PATCHLEVEL 448 #define RUBY_PATCHLEVEL 449
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

4
vm.c
View file

@ -2345,6 +2345,7 @@ core_hash_merge(VALUE hash, long argc, const VALUE *argv)
{ {
long i; long i;
Check_Type(hash, T_HASH);
assert(argc % 2 == 0); assert(argc % 2 == 0);
for (i=0; i<argc; i+=2) { for (i=0; i<argc; i+=2) {
rb_hash_aset(hash, argv[i], argv[i+1]); rb_hash_aset(hash, argv[i], argv[i+1]);
@ -2366,7 +2367,7 @@ core_hash_from_ary(VALUE ary)
VALUE hash = rb_hash_new(); VALUE hash = rb_hash_new();
if (RUBY_DTRACE_HASH_CREATE_ENABLED()) { if (RUBY_DTRACE_HASH_CREATE_ENABLED()) {
RUBY_DTRACE_HASH_CREATE(RARRAY_LEN(ary), rb_sourcefile(), rb_sourceline()); RUBY_DTRACE_HASH_CREATE((Check_Type(ary, T_ARRAY), RARRAY_LEN(ary)), rb_sourcefile(), rb_sourceline());
} }
return core_hash_merge_ary(hash, ary); return core_hash_merge_ary(hash, ary);
@ -2382,6 +2383,7 @@ m_core_hash_merge_ary(VALUE self, VALUE hash, VALUE ary)
static VALUE static VALUE
core_hash_merge_ary(VALUE hash, VALUE ary) core_hash_merge_ary(VALUE hash, VALUE ary)
{ {
Check_Type(ary, T_ARRAY);
core_hash_merge(hash, RARRAY_LEN(ary), RARRAY_CONST_PTR(ary)); core_hash_merge(hash, RARRAY_LEN(ary), RARRAY_CONST_PTR(ary));
return hash; return hash;
} }