diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | array.c | 8 | ||||
| -rw-r--r-- | test/ruby/test_array.rb | 14 |
3 files changed, 24 insertions, 2 deletions
@@ -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> * array.c (flatten): free memo hash table before raising exception. @@ -3107,8 +3107,8 @@ flatten(ary, level, modified) st_table *memo; st_data_t id; - stack = rb_ary_new(); - result = ary_new(rb_class_of(ary), RARRAY_LEN(ary)); + stack = ary_new(0, ARY_DEFAULT_SIZE); + result = ary_new(0, RARRAY_LEN(ary)); memo = st_init_numtable(); st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue); *modified = 0; @@ -3117,6 +3117,9 @@ flatten(ary, level, modified) while (i < RARRAY(ary)->len) { elt = RARRAY(ary)->ptr[i++]; 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)) { rb_ary_push(result, elt); } @@ -3146,6 +3149,7 @@ flatten(ary, level, modified) st_free_table(memo); + RBASIC(result)->klass = rb_class_of(ary); return result; } diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 6a816a2c85..58ffe52675 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -717,6 +717,20 @@ class TestArray < Test::Unit::TestCase @cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten) 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 a1 = @cls[ 'cat', 'dog' ] a2 = @cls[ 'cat', 'dog' ] |