From 6dbc1a53ea7451f9b79d96f6d608764b9d2f9684 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 2 Aug 2009 11:09:12 +0000
Subject: * array.c (rb_ary_combination, rb_ary_product): prevent from GC.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24355 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 0edbda46c..bf4718790 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 */
-	RB_GC_GUARD(t0);
-	RB_GC_GUARD(t1);
+	ary_discard(t0);
+	ary_discard(t1);
 	RBASIC(ary0)->klass = rb_cArray;
     }
     return ary;
@@ -3839,6 +3839,8 @@ rb_ary_combination(VALUE ary, VALUE num)
 		stack[lev--]++;
 	    } while (lev && (stack[lev+1]+n == len+lev+1));
 	}
+	ary_discard(t0);
+	ary_discard(cc);
     }
     return ary;
 }
@@ -3916,6 +3918,8 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 	    counters[m]++;
 	}
     }
+    ary_discard(t0);
+    ary_discard(t1);
 
     return result;
 }
-- 
cgit