ruby-changes:32742
From: usa <ko1@a...>
Date: Wed, 5 Feb 2014 11:42:40 +0900 (JST)
Subject: [ruby-changes:32742] usa:r44821 (ruby_1_9_3): merge revision(s) 44790: [Backport #9472]
usa 2014-02-05 11:42:30 +0900 (Wed, 05 Feb 2014) New Revision: 44821 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44821 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_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/io.c branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 44820) +++ ruby_1_9_3/ChangeLog (revision 44821) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/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] + Wed Feb 5 11:36:30 2014 NARUSE, Yui <naruse@r...> * configure.in (opt-dir): don't use non portable flag -E of sed. Index: ruby_1_9_3/io.c =================================================================== --- ruby_1_9_3/io.c (revision 44820) +++ ruby_1_9_3/io.c (revision 44821) @@ -4213,6 +4213,7 @@ rb_io_syswrite(VALUE io, VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/io.c#L4213 } 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_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 44820) +++ ruby_1_9_3/version.h (revision 44821) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #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 Property changes on: ruby_1_9_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r44790 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/