naruse	2014-02-21 22:48:53 +0900 (Fri, 21 Feb 2014)

  New Revision: 45078

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

  Log:
    merge revision(s) 44790: [Backport #9472]
    
    * io.c (rb_io_syswrite): add RB_GC_GUARD
      [Bug #9472][ruby-core:60407]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/io.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45077)
+++ ruby_2_1/ChangeLog	(revision 45078)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Feb 2 05:48:42 2014  Eric Wong <e@8...>
+
+	* io.c (rb_io_syswrite): add RB_GC_GUARD
+	  [Bug #9472][ruby-core:60407]
+
 Fri Feb 21 17:42:42 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
Index: ruby_2_1/io.c
===================================================================
--- ruby_2_1/io.c	(revision 45077)
+++ ruby_2_1/io.c	(revision 45078)
@@ -4572,6 +4572,7 @@ rb_io_syswrite(VALUE io, VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/io.c#L4572
     }
 
     n = rb_write_internal(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
+    RB_GC_GUARD(str);
 
     if (n == -1) rb_sys_fail_path(fptr->pathv);
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45077)
+++ ruby_2_1/version.h	(revision 45078)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-21"
-#define RUBY_PATCHLEVEL 42
+#define RUBY_PATCHLEVEL 43
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44790


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