diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | array.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Fri May 28 17:34:48 2010 URABE Shyouhei <shyouhei@ruby-lang.org> + + * array.c (rb_ary_product): Use tmpary instead, to ensure marking + arrays by GC. + Fri May 28 11:40:07 2010 URABE Shyouhei <shyouhei@ruby-lang.org> * array.c (rb_ary_product): Do not rely on GC, t0 should be @@ -4294,9 +4294,9 @@ static VALUE rb_ary_product(int argc, VALUE *argv, VALUE ary) { int n = argc+1; /* How many arrays we're operating on */ - volatile VALUE t0 = tmpbuf(n, sizeof(VALUE)); + volatile VALUE t0 = tmpary(n); volatile VALUE t1 = tmpbuf(n, sizeof(int)); - VALUE *arrays = (VALUE*)RSTRING_PTR(t0); /* The arrays we're computing the product of */ + VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */ int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */ VALUE result = Qnil; /* The array we'll be returning, when no block given */ long i,j; @@ -4372,7 +4372,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary) } } done: - tmpbuf_discard(t0); + tmpary_discard(t0); tmpbuf_discard(t1); return NIL_P(result) ? ary : result; |