shyouhei	2010-05-28 11:58:36 +0900 (Fri, 28 May 2010)

  New Revision: 28049

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28049

  Log:
    merge revision(s) 28048:
    * array.c (rb_ary_product): Do not rely on GC, t0 should be
      checked explicitly.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/array.c

Index: ruby_1_9_2/array.c
===================================================================
--- ruby_1_9_2/array.c	(revision 28048)
+++ ruby_1_9_2/array.c	(revision 28049)
@@ -4345,10 +4345,14 @@
 
 	/* put it on the result array */
 	if(NIL_P(result)) {
+	    FL_SET(t0, FL_USER5);
 	    rb_yield(subarray);
-	    if (RBASIC(t0)->klass) {
+	    if (! FL_TEST(t0, FL_USER5)) {
 		rb_raise(rb_eRuntimeError, "product reentered");
 	    }
+	    else {
+		FL_UNSET(t0, FL_USER5);
+	    }
 	}
 	else {
 	    rb_ary_push(result, subarray);
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28048)
+++ ruby_1_9_2/ChangeLog	(revision 28049)
@@ -1,3 +1,8 @@
+Fri May 28 11:58:42 2010  URABE Shyouhei  <shyouhei@r...>
+
+	* array.c (rb_ary_product): Do not rely on GC, t0 should be
+	  checked explicitly.
+
 Fri May 28 10:40:37 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (checking_for): ignore toplevel.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/