kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* io.c (read_all): fix: false negative invalid byte seequence 

on reading from pipes. [ruby-dev:39743]
  fix: assigin the variable 'pos' as relative value from recent pos.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-11-21 07:03:06 +00:00
parent 10aaddb811
commit 8f05568afb
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Nov 21 15:58:43 2009 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (read_all): fix: false negative invalid byte seequence
on reading from pipes. [ruby-dev:39743]
fix: assigin the variable 'pos' as relative value from recent pos.
Sat Nov 21 14:44:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
* file.c (file_path_convert): delay getting UTF8-MAC encoding

2
io.c
View File

@ -1742,7 +1742,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
}
bytes += n;
if (cr != ENC_CODERANGE_BROKEN)
pos = rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + bytes, enc, &cr);
pos += rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + bytes, enc, &cr);
if (bytes < siz) break;
siz += BUFSIZ;
rb_str_resize(str, siz);

6
test/ruby/test_io_m17n.rb
View File

@ -558,6 +558,12 @@ EOT
assert_equal(eucjp, r.read)
}
with_pipe("UTF-8") {|r,w|
w << "a" * 1023 + "\u3042" + "a" * 1022
w.close
assert_equal(true, r.read.valid_encoding?)
}
with_pipe("UTF-8:EUC-JP") {|r,w|
assert_equal(Encoding::UTF_8, r.external_encoding)
assert_equal(Encoding::EUC_JP, r.internal_encoding)