merge revision(s) 44790: [Backport ruby#9472]

nurse · nurse · commit 21b009633f03 · 2014-02-21T13:48:53.000Z
* io.c (rb_io_syswrite): add RB_GC_GUARD [Bug ruby#9472][ruby-core:60407] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 2 05:48:42 2014  Eric Wong <e@80x24.org>
+
+	* io.c (rb_io_syswrite): add RB_GC_GUARD
+	  [Bug #9472][ruby-core:60407]
+
 Fri Feb 21 17:42:42 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
diff --git a/io.c b/io.c
@@ -4572,6 +4572,7 @@ rb_io_syswrite(VALUE io, VALUE str)
     }
 
     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);
 
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Sun Feb 2 05:48:42 2014  Eric Wong <[email protected]>
++
 +	* io.c (rb_io_syswrite): add RB_GC_GUARD
 +	  [Bug #9472][ruby-core:60407]
++
 Fri Feb 21 17:42:42 2014  Nobuyoshi Nakada  <[email protected]>
 	* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
Original file line number	Diff line number	Diff line change
`@@ -4572,6 +4572,7 @@ rb_io_syswrite(VALUE io, VALUE str)`
`4572`	`4572`	`}`
`4573`	`4573`
`4574`	`4574`	`n = rb_write_internal(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));`
	`4575`	`+ RB_GC_GUARD(str);`
`4575`	`4576`
`4576`	`4577`	`if (n == -1) rb_sys_fail_path(fptr->pathv);`
`4577`	`4578`