From 330be69e4310886cc0d54356b2273113d288d9b1 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 3 Aug 2009 04:05:37 +0000 Subject: * array.c (rb_ary_{permutation,combination,product}): must not use ary_discard on strings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index bf47187906..0695fcf2b1 100644 --- a/array.c +++ b/array.c @@ -3748,8 +3748,8 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary) for (i = 0; i < n; i++) used[i] = 0; /* initialize array */ permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */ - ary_discard(t0); - ary_discard(t1); + rb_str_resize(t0, 0L); + rb_str_resize(t1, 0L); RBASIC(ary0)->klass = rb_cArray; } return ary; @@ -3839,7 +3839,7 @@ rb_ary_combination(VALUE ary, VALUE num) stack[lev--]++; } while (lev && (stack[lev+1]+n == len+lev+1)); } - ary_discard(t0); + rb_str_resize(t0, 0L); ary_discard(cc); } return ary; @@ -3918,8 +3918,8 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary) counters[m]++; } } - ary_discard(t0); - ary_discard(t1); + rb_str_resize(t0, 0L); + rb_str_resize(t1, 0L); return result; } -- cgit v1.2.3