summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-02 12:40:31 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-02 12:40:31 +0000
commit9619b029fc09af7e2254378a9f1505a76fe08a25 (patch)
treed18ddf27d7b8b4d5a8a3ec1d7699d9ac864a6fcd
parentb154338061fb89ac5978ffe9c17bc422df5015ee (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_2_0_0@44792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c1
-rw-r--r--version.h8
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d39a7fce4a..5d3f6ff7fa 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]
+
Fri Jan 31 00:51:50 2014 Shugo Maeda <shugo@ruby-lang.org>
* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
diff --git a/io.c b/io.c
index 23ab37144a..9940bc6e2a 100644
--- a/io.c
+++ b/io.c
@@ -4517,6 +4517,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 bde1d88f7f..27fd0c5adf 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#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"