1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hash.c: raise on invalid input

Browse Source 
* hash.c (rb_hash_s_create): raise an exception, when input elements
  are not one or two elements arrays.  [ruby-core:39945] [Bug #5406]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-07-14 08:08:15 +00:00
parent e81c1d53fe
commit 8d6add973e
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jul 14 17:08:13 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_hash_s_create): raise an exception, when input elements
are not one or two elements arrays. [ruby-core:39945] [Bug #5406]
Sat Jul 14 16:16:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jul 14 16:16:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): use * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): use

7
hash.c
View File

@ -393,8 +393,13 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]); VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
VALUE key, val = Qnil; VALUE key, val = Qnil;
if (NIL_P(v)) continue; if (NIL_P(v)) {
rb_raise(rb_eArgError, "wrong element type (expected array)");
}
switch (RARRAY_LEN(v)) { switch (RARRAY_LEN(v)) {
default:
rb_raise(rb_eArgError, "invalid number of elements (%ld for 1..2)",
RARRAY_LEN(v));
case 2: case 2:
val = RARRAY_PTR(v)[1]; val = RARRAY_PTR(v)[1];
case 1: case 1:

3
test/ruby/test_hash.rb
View File

@ -712,6 +712,9 @@ class TestHash < Test::Unit::TestCase
def test_create def test_create
assert_equal({1=>2, 3=>4}, Hash[[[1,2],[3,4]]]) assert_equal({1=>2, 3=>4}, Hash[[[1,2],[3,4]]])
assert_raise(ArgumentError) { Hash[0, 1, 2] } assert_raise(ArgumentError) { Hash[0, 1, 2] }
bug5406 = '[ruby-core:39945]'
assert_raise(ArgumentError, bug5406) { Hash[[[1, 2], 3]] }
assert_raise(ArgumentError, bug5406) { Hash[[[1, 2], [3, 4, 5]]] }
assert_equal({1=>2, 3=>4}, Hash[1,2,3,4]) assert_equal({1=>2, 3=>4}, Hash[1,2,3,4])
o = Object.new o = Object.new
def o.to_hash() {1=>2} end def o.to_hash() {1=>2} end