diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | hash.c | 7 | ||||
| -rw-r--r-- | test/ruby/test_hash.rb | 3 |
3 files changed, 14 insertions, 1 deletions
@@ -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> * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): use @@ -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 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)) { + default: + rb_raise(rb_eArgError, "invalid number of elements (%ld for 1..2)", + RARRAY_LEN(v)); case 2: val = RARRAY_PTR(v)[1]; case 1: diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 0c03bf4726..34d58a0354 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -712,6 +712,9 @@ class TestHash < Test::Unit::TestCase def test_create assert_equal({1=>2, 3=>4}, Hash[[[1,2],[3,4]]]) 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]) o = Object.new def o.to_hash() {1=>2} end |