From 72385b042df0c69d0d74cf998eaf959f0db9b904 Mon Sep 17 00:00:00 2001 From: glass Date: Thu, 2 Jan 2014 07:29:13 +0000 Subject: * io.c (io_fwrite): freeze converted str. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 32d81c7e06..dd36aaca69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jan 2 16:07:21 2014 Masaki Matsushita + + * io.c (io_fwrite): freeze converted str. + Thu Jan 2 04:15:13 2014 Nobuyoshi Nakada * eval.c (rb_longjmp): remove an extra modifier from the forward diff --git a/io.c b/io.c index e7464150d9..ed170cda13 100644 --- a/io.c +++ b/io.c @@ -1358,7 +1358,11 @@ io_fwrite(VALUE str, rb_io_t *fptr, int nosync) } #endif str = do_writeconv(str, fptr, &converted); - if (!converted) str = rb_str_new_frozen(str); + if (converted) + OBJ_FREEZE(str); + else + str = rb_str_new_frozen(str); + return io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str), fptr, nosync); } -- cgit v1.2.3