From 209b950f3f92b8f7734a9b1456afedf7b5280b51 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 1 Oct 2007 23:37:02 +0000 Subject: [PATCH] * array.c (rb_ary_permutation): small dirty hack by Matz to avoid arrays on stack. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 3 +++ array.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17b79034db..d3c1358828 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ Tue Oct 2 08:25:50 2007 Yukihiro Matsumoto * array.c (rb_ary_combination): RDoc update to clarify. a patch from David Flanagan. [ruby-core:12344] + * array.c (rb_ary_permutation): small dirty hack by Matz to avoid + arrays on stack. + Tue Oct 2 07:01:05 2007 Koichi Sasada * proc.c (proc_dup): proc->block.proc should be self. diff --git a/array.c b/array.c index 93a95d96e8..801f2e6c2d 100644 --- a/array.c +++ b/array.c @@ -3036,8 +3036,11 @@ rb_ary_permutation(VALUE ary, VALUE num) } else { /* this is the general case */ ary = rb_ary_dup(ary); /* private defensive copy of ary */ - long p[n]; - int used[n]; + volatile VALUE t0 = rb_str_new(0, n*sizeof(long)); + long *p = (long*)RSTRING_PTR(t0); /* array indexes of current permutation */ + volatile VALUE t1 = rb_str_new(0, n*sizeof(int)); + int *used = (int*)RSTRING_PTR(t1); /* booleans: which indexes are already used */ + for(i = 0; i < n; i++) used[i] = 0; /* initialize array */ permute0(n,r,p,0,used,ary); /* compute and yield permutations */