1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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_1@45078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-21 13:48:53 +00:00
parent 14a3402357
commit cb6602490b
3 changed files with 7 additions and 1 deletions

View file

@ -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

1
io.c
View file

@ -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);

View file

@ -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