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

* stringio/stringio.c (strio_read): set ASCII-8BIT encoding

Browse source 
when length argument is given.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-09-28 01:08:24 +00:00
parent ea229a855f
commit b07650769e
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Sep 28 10:06:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
* stringio/stringio.c (strio_read): set ASCII-8BIT encoding
when length argument is given.
Mon Sep 28 01:28:17 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org> Mon Sep 28 01:28:17 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* Makefile.in (miniruby): suppress duplication warning on AIX. * Makefile.in (miniruby): suppress duplication warning on AIX.

6
ext/stringio/stringio.c
View file

@ -1168,7 +1168,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
{ {
struct StringIO *ptr = readable(StringIO(self)); struct StringIO *ptr = readable(StringIO(self));
VALUE str = Qnil; VALUE str = Qnil;
long len, olen; long len;
switch (argc) { switch (argc) {
case 2: case 2:
@ -1177,7 +1177,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
rb_str_modify(str); rb_str_modify(str);
case 1: case 1:
if (!NIL_P(argv[0])) { if (!NIL_P(argv[0])) {
len = olen = NUM2LONG(argv[0]); len = NUM2LONG(argv[0]);
if (len < 0) { if (len < 0) {
rb_raise(rb_eArgError, "negative length %ld given", len); rb_raise(rb_eArgError, "negative length %ld given", len);
} }
@ -1189,7 +1189,6 @@ strio_read(int argc, VALUE *argv, VALUE self)
} }
/* fall through */ /* fall through */
case 0: case 0:
olen = -1;
len = RSTRING_LEN(ptr->string); len = RSTRING_LEN(ptr->string);
if (len <= ptr->pos) { if (len <= ptr->pos) {
if (NIL_P(str)) { if (NIL_P(str)) {
@ -1209,6 +1208,7 @@ strio_read(int argc, VALUE *argv, VALUE self)
} }
if (NIL_P(str)) { if (NIL_P(str)) {
str = strio_substr(ptr, ptr->pos, len); str = strio_substr(ptr, ptr->pos, len);
if (argc > 0) rb_enc_associate(str, rb_ascii8bit_encoding());
} }
else { else {
long rest = RSTRING_LEN(ptr->string) - ptr->pos; long rest = RSTRING_LEN(ptr->string) - ptr->pos;

5
test/stringio/test_stringio.rb
View file

@ -382,9 +382,12 @@ class TestStringIO < Test::Unit::TestCase
end end
def test_read def test_read
f = StringIO.new("1234") f = StringIO.new("\u3042\u3044")
assert_raise(ArgumentError) { f.read(-1) } assert_raise(ArgumentError) { f.read(-1) }
assert_raise(ArgumentError) { f.read(1, 2, 3) } assert_raise(ArgumentError) { f.read(1, 2, 3) }
assert_equal("\u3042\u3044", f.read)
f.rewind
assert_equal("\u3042\u3044".force_encoding(Encoding::ASCII_8BIT), f.read(f.size))
end end
def test_size def test_size