* array.c (rb_ary_{permutation,combination,product}): must not use

  ary_discard on strings.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 1162d0543..555deb38e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug  3 13:05:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_{permutation,combination,product}): must not use
+	  ary_discard on strings.
+
 Mon Aug  3 00:32:00 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* random.c (rb_random_int): arguments have to be converted to
diff --git a/array.c b/array.c
index bf4718790..0695fcf2b 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;
 }