archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) r45646: [Backport #9765]

Browse source 
* ext/stringio/stringio.c (strio_putc): fix for non-ascii
	  encoding, like as IO#putc.  [ruby-dev:48114] [Bug #9765]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-05-28 14:38:54 +00:00
parent 7ebed66e59
commit fc9677332a
4 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed May 28 23:37:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_putc): fix for non-ascii
encoding, like as IO#putc. [ruby-dev:48114] [Bug #9765]
Wed May 28 01:05:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed May 28 01:05:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/fileutils.rb (FileUtils#copy_entry): update rdoc about * lib/fileutils.rb (FileUtils#copy_entry): update rdoc about

16
ext/stringio/stringio.c
View file

@ -1233,17 +1233,17 @@ static VALUE
strio_putc(VALUE self, VALUE ch) strio_putc(VALUE self, VALUE ch)
{ {
struct StringIO *ptr = writable(self); struct StringIO *ptr = writable(self);
int c = NUM2CHR(ch); VALUE str;
long olen;
check_modifiable(ptr); check_modifiable(ptr);
olen = RSTRING_LEN(ptr->string); if (RB_TYPE_P(ch, T_STRING)) {
if (ptr->flags & FMODE_APPEND) { str = rb_str_substr(ch, 0, 1);
ptr->pos = olen;
} }
strio_extend(ptr, ptr->pos, 1); else {
RSTRING_PTR(ptr->string)[ptr->pos++] = c; char c = NUM2CHR(ch);
OBJ_INFECT(ptr->string, self); str = rb_str_new(&c, 1);
}
strio_write(self, str);
return ch; return ch;
} }

16
test/stringio/test_stringio.rb
View file

@ -419,6 +419,22 @@ class TestStringIO < Test::Unit::TestCase
assert_equal("foo123", s) assert_equal("foo123", s)
end end
def test_putc_nonascii
s = ""
f = StringIO.new(s, "w")
f.putc("\u{3042}")
f.putc(0x3044)
f.close
assert_equal("\u{3042}D", s)
s = "foo"
f = StringIO.new(s, "a")
f.putc("\u{3042}")
f.putc(0x3044)
f.close
assert_equal("foo\u{3042}D", s)
end
def test_read def test_read
f = StringIO.new("\u3042\u3044") f = StringIO.new("\u3042\u3044")
assert_raise(ArgumentError) { f.read(-1) } assert_raise(ArgumentError) { f.read(-1) }

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-05-28" #define RUBY_RELEASE_DATE "2014-05-28"
#define RUBY_PATCHLEVEL 112 #define RUBY_PATCHLEVEL 113
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5