summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-05 02:42:30 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-05 02:42:30 +0000
commit13848d6048d7518bd69e2b6f6b72bffaac531032 (patch)
tree2b7eaeaa6d7bc05996f357ff2cd9363ccb834f02
parentb2a2fa42960c90d825b5ffad32d4331d0145b8f5 (diff)
merge revision(s) 44790: [Backport #9472]
* io.c (rb_io_syswrite): add RB_GC_GUARD [Bug #9472][ruby-core:60407] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c1
-rw-r--r--version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 259c53f450..75630030b0 100644
--- 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]
+
Wed Feb 5 11:36:30 2014 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in (opt-dir): don't use non portable flag -E of sed.
diff --git a/io.c b/io.c
index 9c2adb22ec..7c8f2c9762 100644
--- a/io.c
+++ b/io.c
@@ -4213,6 +4213,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
index bde48b91a4..8e38488132 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 512
+#define RUBY_PATCHLEVEL 513
#define RUBY_RELEASE_DATE "2014-02-05"
#define RUBY_RELEASE_YEAR 2014