[前][次][番号順一覧][スレッド一覧]

ruby-changes:32713

From: nagachika <ko1@a...>
Date: Sun, 2 Feb 2014 21:40:40 +0900 (JST)
Subject: [ruby-changes:32713] nagachika:r44792 (ruby_2_0_0): merge revision(s) 44790: [Backport #9472]

nagachika	2014-02-02 21:40:31 +0900 (Sun, 02 Feb 2014)

  New Revision: 44792

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

  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_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/io.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44791)
+++ ruby_2_0_0/ChangeLog	(revision 44792)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/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 Jan 31 00:51:50 2014  Shugo Maeda  <shugo@r...>
 
 	* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
Index: ruby_2_0_0/io.c
===================================================================
--- ruby_2_0_0/io.c	(revision 44791)
+++ ruby_2_0_0/io.c	(revision 44792)
@@ -4517,6 +4517,7 @@ rb_io_syswrite(VALUE io, VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/io.c#L4517
     }
 
     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_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44791)
+++ ruby_2_0_0/version.h	(revision 44792)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-01-31"
-#define RUBY_PATCHLEVEL 391
+#define RUBY_RELEASE_DATE "2014-02-02"
+#define RUBY_PATCHLEVEL 392
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 2
 
 #include "ruby/version.h"
 

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


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

[前][次][番号順一覧][スレッド一覧]