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

merge revision(s) r47716: [Backport #10285]

Browse source 
* ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO
	  should be writable any encoding strings, without conversion.
	  [ruby-core:65240] [Bug #10285]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-10-16 13:19:07 +00:00
parent e0a5ccfec1
commit 10a4543f71
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Oct 16 22:10:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO
should be writable any encoding strings, without conversion.
[ruby-core:65240] [Bug #10285]
Thu Oct 16 22:06:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (eval_string_with_cref): fix super from eval with

5
ext/stringio/stringio.c
View file

@ -1169,12 +1169,13 @@ strio_write(VALUE self, VALUE str)
struct StringIO *ptr = writable(self);
long len, olen;
rb_encoding *enc, *enc2;
rb_encoding *const ascii8bit = rb_ascii8bit_encoding();
if (!RB_TYPE_P(str, T_STRING))
str = rb_obj_as_string(str);
enc = rb_enc_get(ptr->string);
enc2 = rb_enc_get(str);
if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
if (enc != enc2 && enc != ascii8bit) {
str = rb_str_conv_enc(str, enc2, enc);
}
len = RSTRING_LEN(str);
@ -1185,7 +1186,7 @@ strio_write(VALUE self, VALUE str)
ptr->pos = olen;
}
if (ptr->pos == olen) {
if (enc2 == rb_ascii8bit_encoding()) {
if (enc == ascii8bit || enc2 == ascii8bit) {
rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc);
OBJ_INFECT(ptr->string, str);
}

12
test/stringio/test_stringio.rb
View file

@ -137,6 +137,18 @@ class TestStringIO < Test::Unit::TestCase
assert_equal(Encoding::UTF_8, s.encoding, "honor the original encoding over ASCII-8BIT")
end
def test_set_encoding
bug10285 = '[ruby-core:65240] [Bug #10285]'
f = StringIO.new()
f.set_encoding(Encoding::ASCII_8BIT)
f.write("quz \x83 mat".b)
s = "foo \x97 bar".force_encoding(Encoding::WINDOWS_1252)
assert_nothing_raised(Encoding::CompatibilityError, bug10285) {
f.write(s)
}
assert_equal(Encoding::ASCII_8BIT, f.string.encoding, bug10285)
end
def test_mode_error
f = StringIO.new("", "r")
assert_raise(IOError) { f.write("foo") }

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.4"
#define RUBY_RELEASE_DATE "2014-10-16"
#define RUBY_PATCHLEVEL 258
#define RUBY_PATCHLEVEL 259
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 10