nagachika	2011-08-10 00:10:25 +0900 (Wed, 10 Aug 2011)

  New Revision: 32897

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

  Log:
    merge revision(s) 32859:
    
           * ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD.
             [ruby-dev:44337] [Bug #5152]
    
           * ext/date/data_parse.c (parse_ddd_cb): ditto.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/date/date_parse.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32896)
+++ ruby_1_9_3/ChangeLog	(revision 32897)
@@ -1,3 +1,10 @@
+Tue Aug  9 22:57:45 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD.
+	  [ruby-dev:44337] [Bug #5152]
+
+	* ext/date/data_parse.c (parse_ddd_cb): ditto.
+
 Tue Aug  9 12:20:33 2011  Naohisa Goto  <ngotogenome@g...>
 
 	* test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
Index: ruby_1_9_3/ext/date/date_parse.c
===================================================================
--- ruby_1_9_3/ext/date/date_parse.c	(revision 32896)
+++ ruby_1_9_3/ext/date/date_parse.c	(revision 32897)
@@ -530,6 +530,7 @@
 	    }
 	}
     }
+    RB_GC_GUARD(str);
   ok:
     return offset;
 }
@@ -1322,6 +1323,7 @@
 	    set_hash("yday", INT2FIX(n2i(cs2,    4, 3)));
 	}
 	break;
+	RB_GC_GUARD(s2);
     }
     if (!NIL_P(s3)) {
 	cs3 = RSTRING_PTR(s3);
@@ -1353,6 +1355,7 @@
 		break;
 	    }
 	}
+	RB_GC_GUARD(s3);
     }
     if (!NIL_P(s4)) {
 	l4 = RSTRING_LEN(s4);
@@ -1391,6 +1394,7 @@
 		*--s1 = '+';
 	    set_hash("offset", date_zone_to_diff(rb_str_new2(s1)));
 	}
+	RB_GC_GUARD(s5);
     }
 
     return 1;

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