tarui	2010-06-29 21:17:07 +0900 (Tue, 29 Jun 2010)

  New Revision: 28478

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

  Log:
    merge from trunk (r28477)
    
    * ext/stringio/stringio.c (strio_write): add RB_GC_GUARD.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/stringio/stringio.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28477)
+++ ruby_1_9_2/ChangeLog	(revision 28478)
@@ -1,3 +1,7 @@
+Tue Jun 29 21:16:05 2010  Masaya Tarui  <tarui@r...>
+
+	* ext/stringio/stringio.c (strio_write): add RB_GC_GUARD.
+
 Tue Jun 29 14:41:07 2010  NAKAMURA Usaku  <usa@r...>
 
 	* file.c (rb_realpath_internal, realpath_rec): skip UNC share root
Index: ruby_1_9_2/ext/stringio/stringio.c
===================================================================
--- ruby_1_9_2/ext/stringio/stringio.c	(revision 28477)
+++ ruby_1_9_2/ext/stringio/stringio.c	(revision 28478)
@@ -1107,6 +1107,7 @@
     long len, olen;
     rb_encoding *enc, *enc2;
 
+    RB_GC_GUARD(str);
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
     enc = rb_enc_get(ptr->string);

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