From 77061811ee6b618d1efd8a2ca66aec82d9077f33 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 22 May 2008 03:40:57 +0000 Subject: * array.c (flatten): check if reentered. [ruby-dev:34798] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index 3936cede4..2cd3478ed 100644 --- a/array.c +++ b/array.c @@ -2831,8 +2831,8 @@ flatten(VALUE ary, int level, int *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; @@ -2841,6 +2841,9 @@ flatten(VALUE ary, int level, int *modified) while (i < RARRAY_LEN(ary)) { elt = RARRAY_PTR(ary)[i++]; tmp = rb_check_array_type(elt); + if (RBASIC(result)->klass) { + rb_raise(rb_eRuntimeError, "flatten reentered"); + } if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) { rb_ary_push(result, elt); } @@ -2870,6 +2873,7 @@ flatten(VALUE ary, int level, int *modified) st_free_table(memo); + RBASIC(result)->klass = rb_class_of(ary); return result; } -- cgit