diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-22 13:46:12 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-22 13:46:12 +0000 |
commit | 4e1f1ec1a869e8b417b7f638ac4b62945b422b61 (patch) | |
tree | e922e66662f97b9f390eeb784b60238b3f33e378 /vm.c | |
parent | e120cc91f0fedc876e23259ecdb9fb65c71e57dd (diff) |
merge revision(s) 57024: [Backport #13015]
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_3@58056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2529,6 +2529,7 @@ core_hash_merge(VALUE hash, long argc, const VALUE *argv) { long i; + Check_Type(hash, T_HASH); VM_ASSERT(argc % 2 == 0); for (i=0; i<argc; i+=2) { rb_hash_aset(hash, argv[i], argv[i+1]); @@ -2549,7 +2550,7 @@ core_hash_from_ary(VALUE ary) { VALUE hash = rb_hash_new(); - RUBY_DTRACE_CREATE_HOOK(HASH, RARRAY_LEN(ary)); + RUBY_DTRACE_CREATE_HOOK(HASH, (Check_Type(ary, T_ARRAY), RARRAY_LEN(ary))); return core_hash_merge_ary(hash, ary); } @@ -2563,6 +2564,7 @@ m_core_hash_merge_ary(VALUE self, VALUE hash, VALUE ary) static VALUE core_hash_merge_ary(VALUE hash, VALUE ary) { + Check_Type(ary, T_ARRAY); core_hash_merge(hash, RARRAY_LEN(ary), RARRAY_CONST_PTR(ary)); return hash; } |