aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-21 06:06:10 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-21 06:06:10 +0000
commit53b3bf961cd4f4de0388d56c7d8b5059eba1c3c0 (patch)
tree84cdedeb3b63a55b2da4398e0fcd2bc35e77f439
parentd154b1c346448b432245d19147502bbffb796cb5 (diff)
downloadruby-53b3bf961cd4f4de0388d56c7d8b5059eba1c3c0.tar.gz
* array.c (rb_ary_permutation): add gc guard codes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--array.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 49ec403c42..c4001532d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 21 14:55:13 2007 Koichi Sasada <ko1@atdot.net>
+
+ * array.c (rb_ary_permutation): add gc guard codes.
+
Wed Nov 21 03:12:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* process.c (rb_f_system): returns nil on execution failure.
diff --git a/array.c b/array.c
index 403d8b3c5a..b0010672c4 100644
--- a/array.c
+++ b/array.c
@@ -3047,15 +3047,17 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
}
}
else { /* this is the general case */
- volatile VALUE t0 = tmpbuf(n,sizeof(long));
+ VALUE t0 = tmpbuf(n,sizeof(long));
long *p = (long*)RSTRING_PTR(t0);
- volatile VALUE t1 = tmpbuf(n,sizeof(int));
+ VALUE t1 = tmpbuf(n,sizeof(int));
int *used = (int*)RSTRING_PTR(t1);
VALUE ary0 = ary_make_shared(ary); /* private defensive copy of 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);
}
return ary;
}