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

Add arity check into Hash#flatten

Browse source 
* hash.c (rb_hash_flatten): add arity check

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2017-10-22 00:38:05 +00:00
parent fdc5864090
commit f1f7b51d73
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hash.c
View file

@ -2787,17 +2787,23 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
{ {
VALUE ary; VALUE ary;
rb_check_arity(argc, 0, 1);
if (argc) { if (argc) {
int level = NUM2INT(*argv); int level = NUM2INT(argv[0]);
if (level == 0) return rb_hash_to_a(hash); if (level == 0) return rb_hash_to_a(hash);
ary = rb_ary_new_capa(RHASH_SIZE(hash) * 2); ary = rb_ary_new_capa(RHASH_SIZE(hash) * 2);
rb_hash_foreach(hash, flatten_i, ary); rb_hash_foreach(hash, flatten_i, ary);
if (level - 1 > 0) { level--;
*argv = INT2FIX(level - 1);
rb_funcallv(ary, id_flatten_bang, argc, argv); if (level > 0) {
VALUE ary_flatten_level = INT2FIX(level);
rb_funcallv(ary, id_flatten_bang, 1, &ary_flatten_level);
} }
else if (level < 0) { else if (level < 0) {
/* flatten recursively */
rb_funcallv(ary, id_flatten_bang, 0, 0); rb_funcallv(ary, id_flatten_bang, 0, 0);
} }
} }

7
test/ruby/test_hash.rb
View file

@ -1118,7 +1118,12 @@ class TestHash < Test::Unit::TestCase
assert_equal([1, "one", 2, 2, "two", 3, 3, ["three"]], a.flatten(2)) assert_equal([1, "one", 2, 2, "two", 3, 3, ["three"]], a.flatten(2))
assert_equal([1, "one", 2, 2, "two", 3, 3, "three"], a.flatten(3)) assert_equal([1, "one", 2, 2, "two", 3, 3, "three"], a.flatten(3))
assert_equal([1, "one", 2, 2, "two", 3, 3, "three"], a.flatten(-1)) assert_equal([1, "one", 2, 2, "two", 3, 3, "three"], a.flatten(-1))
assert_raise(TypeError){ a.flatten(Object) } assert_raise(TypeError){ a.flatten(nil) }
end
def test_flatten_arity
a = @cls[1=> "one", 2 => [2,"two"], 3 => [3, ["three"]]]
assert_raise(ArgumentError){ a.flatten(1, 2) }
end end
def test_callcc def test_callcc