nagachika	2011-08-13 09:48:16 +0900 (Sat, 13 Aug 2011)

  New Revision: 32966

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

  Log:
    * backport r32962+r32965 from trunk.
    
    * ext/date/date_parse.c (parse_ddd_cb): fix r32896. RB_GC_GUARD
      insertion position was mistaken. [ruby-dev:44337] [Bug #5152]

  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 32965)
+++ ruby_1_9_3/ChangeLog	(revision 32966)
@@ -1,3 +1,8 @@
+Sat Aug 13 09:36:19 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* ext/date/date_parse.c (parse_ddd_cb): fix r32896. RB_GC_GUARD
+	  insertion position was mistaken. [ruby-dev:44337] [Bug #5152]
+
 Sat Aug 13 09:26:24 2011  Aaron Patterson <aaron@t...>
 
 	* ext/psych/lib/psych/core_ext.rb: Make Kernel#y private.
Index: ruby_1_9_3/ext/date/date_parse.c
===================================================================
--- ruby_1_9_3/ext/date/date_parse.c	(revision 32965)
+++ ruby_1_9_3/ext/date/date_parse.c	(revision 32966)
@@ -1323,8 +1323,8 @@
 	    set_hash("yday", INT2FIX(n2i(cs2,    4, 3)));
 	}
 	break;
-	RB_GC_GUARD(s2);
     }
+    RB_GC_GUARD(s2);
     if (!NIL_P(s3)) {
 	cs3 = RSTRING_PTR(s3);
 	l3 = RSTRING_LEN(s3);

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