kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r24364 from trunk into ruby_1_9_1.

Browse source 
--
* array.c (rb_ary_{permutation,combination}): disallow reentrance
  with continuation since work-buffers cannot restore.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-08-08 15:32:09 +00:00
parent 208ec9936a
commit 7ad4bd137d
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Mon Aug 3 13:05:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Aug 3 15:48:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_{permutation,combination}): disallow reentrance
with continuation since work-buffers cannot restore.
* array.c (rb_ary_{permutation,combination,product}): must not use * array.c (rb_ary_{permutation,combination,product}): must not use
ary_discard on strings. ary_discard on strings.

10
array.c
View file

@ -3401,6 +3401,7 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
} }
#define tmpbuf(n, size) rb_str_tmp_new((n)*(size)) #define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
#define tmpary(n) rb_ary_tmp_new(n)
/* /*
* Recursively compute permutations of r elements of the set [0..n-1]. * Recursively compute permutations of r elements of the set [0..n-1].
@ -3438,6 +3439,9 @@ permute0(long n, long r, long *p, long index, int *used, VALUE values)
for (j = 0; j < r; j++) result_array[j] = values_array[p[j]]; for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
ARY_SET_LEN(result, r); ARY_SET_LEN(result, r);
rb_yield(result); rb_yield(result);
if (RBASIC(values)->klass) {
rb_raise(rb_eRuntimeError, "permute reentered");
}
} }
} }
} }
@ -3576,11 +3580,10 @@ rb_ary_combination(VALUE ary, VALUE num)
volatile VALUE t0 = tmpbuf(n+1, sizeof(long)); volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
long *stack = (long*)RSTRING_PTR(t0); long *stack = (long*)RSTRING_PTR(t0);
long nlen = combi_len(len, n); long nlen = combi_len(len, n);
volatile VALUE cc = rb_ary_new2(n); volatile VALUE cc = tmpary(n);
VALUE *chosen = RARRAY_PTR(cc); VALUE *chosen = RARRAY_PTR(cc);
long lev = 0; long lev = 0;
RBASIC(cc)->klass = 0;
MEMZERO(stack, long, n); MEMZERO(stack, long, n);
stack[0] = -1; stack[0] = -1;
for (i = 0; i < nlen; i++) { for (i = 0; i < nlen; i++) {
@ -3589,6 +3592,9 @@ rb_ary_combination(VALUE ary, VALUE num)
chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1]; chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
} }
rb_yield(rb_ary_new4(n, chosen)); rb_yield(rb_ary_new4(n, chosen));
if (RBASIC(t0)->klass) {
rb_raise(rb_eRuntimeError, "combination reentered");
}
do { do {
stack[lev--]++; stack[lev--]++;
} while (lev && (stack[lev+1]+n == len+lev+1)); } while (lev && (stack[lev+1]+n == len+lev+1));

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 263 #define RUBY_PATCHLEVEL 264
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1