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

* array.c (flatten): check if reentered. [ruby-dev:34798]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-05-22 05:20:59 +00:00
parent eb995e1120
commit 0ba197f08f
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu May 22 14:20:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (flatten): check if reentered. [ruby-dev:34798]
Thu May 22 08:28:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Thu May 22 08:28:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (flatten): free memo hash table before raising exception. * array.c (flatten): free memo hash table before raising exception.

8
array.c
View file

@ -3107,8 +3107,8 @@ flatten(ary, level, modified)
st_table *memo; st_table *memo;
st_data_t id; st_data_t id;
stack = rb_ary_new(); stack = ary_new(0, ARY_DEFAULT_SIZE);
result = ary_new(rb_class_of(ary), RARRAY_LEN(ary)); result = ary_new(0, RARRAY_LEN(ary));
memo = st_init_numtable(); memo = st_init_numtable();
st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue); st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
*modified = 0; *modified = 0;
@ -3117,6 +3117,9 @@ flatten(ary, level, modified)
while (i < RARRAY(ary)->len) { while (i < RARRAY(ary)->len) {
elt = RARRAY(ary)->ptr[i++]; elt = RARRAY(ary)->ptr[i++];
tmp = rb_check_array_type(elt); tmp = rb_check_array_type(elt);
if (RBASIC(result)->klass) {
rb_raise(rb_eRuntimeError, "flatten reentered");
}
if (NIL_P(tmp) || (level >= 0 && RARRAY(stack)->len / 2 >= level)) { if (NIL_P(tmp) || (level >= 0 && RARRAY(stack)->len / 2 >= level)) {
rb_ary_push(result, elt); rb_ary_push(result, elt);
} }
@ -3146,6 +3149,7 @@ flatten(ary, level, modified)
st_free_table(memo); st_free_table(memo);
RBASIC(result)->klass = rb_class_of(ary);
return result; return result;
} }

14
test/ruby/test_array.rb
View file

@ -717,6 +717,20 @@ class TestArray < Test::Unit::TestCase
@cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten) @cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten)
end end
def test_flatten_with_callcc
respond_to?(:callcc, true) or require 'continuation'
o = Object.new
def o.to_ary() callcc {|k| @cont = k; [1,2,3]} end
begin
assert_equal([10, 20, 1, 2, 3, 30, 1, 2, 3, 40], [10, 20, o, 30, o, 40].flatten)
rescue => e
else
o.instance_eval {@cont}.call
end
assert_instance_of(RuntimeError, e, '[ruby-dev:34798]')
assert_match(/reentered/, e.message, '[ruby-dev:34798]')
end
def test_hash def test_hash
a1 = @cls[ 'cat', 'dog' ] a1 = @cls[ 'cat', 'dog' ]
a2 = @cls[ 'cat', 'dog' ] a2 = @cls[ 'cat', 'dog' ]