summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-17 02:57:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-17 02:57:39 +0000
commit84bf320bea3bce391ecc19e6004c232ff76d5c43 (patch)
treebf8af37a911dc1fe3a38fcafe682fd8da41eef23
parente9f7e1c235f6c7c0570bbdd5d663d4bfa039ae32 (diff)
io.c: raise at incomplete char
* io.c (rb_io_each_codepoint): raise an exception at incomplete character before EOF when conversion takes place. [Bug #11444] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--NEWS2
-rw-r--r--io.c9
-rw-r--r--test/ruby/test_io_m17n.rb51
4 files changed, 48 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f57e6a..4bfd032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 17 11:57:36 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_each_codepoint): raise an exception at incomplete
+ character before EOF when conversion takes place. [Bug #11444]
+
Sun Aug 16 17:33:45 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* gems/bundled_gems: update latest version of bundled gems.
diff --git a/NEWS b/NEWS
index aada452..7bdf9b8b 100644
--- a/NEWS
+++ b/NEWS
@@ -80,6 +80,8 @@ with all sufficient information, see the ChangeLog file.
* IO
* IO#close doesn't raise when the IO object is closed. [Feature #10718]
+ * IO#each_codepoint raises an exception at incomplete character
+ before EOF when conversion takes place. [Bug #11444]
* Module
* Module#define_method and Object.define_singleton_method now
diff --git a/io.c b/io.c
index fc973bc..93a808b 100644
--- a/io.c
+++ b/io.c
@@ -3727,13 +3727,16 @@ rb_io_each_codepoint(VALUE io)
}
if (more_char(fptr) == MORE_CHAR_FINISHED) {
clear_readconv(fptr);
- /* ignore an incomplete character before EOF */
+ if (!MBCLEN_CHARFOUND_P(r)) {
+ enc = fptr->encs.enc;
+ goto invalid;
+ }
return io;
}
}
if (MBCLEN_INVALID_P(r)) {
- rb_raise(rb_eArgError, "invalid byte sequence in %s",
- rb_enc_name(fptr->encs.enc));
+ enc = fptr->encs.enc;
+ goto invalid;
}
n = MBCLEN_CHARFOUND_LEN(r);
if (fptr->encs.enc) {
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb
index 55e23a2..ea68219 100644
--- a/test/ruby/test_io_m17n.rb
+++ b/test/ruby/test_io_m17n.rb
@@ -1,6 +1,7 @@
# coding: US-ASCII
require 'test/unit'
require 'tmpdir'
+require 'tempfile'
require 'timeout'
class TestIO_M17N < Test::Unit::TestCase
@@ -2564,22 +2565,40 @@ EOT
end
def test_each_codepoint_need_more
- code = <<-'end;'
- c = nil
- begin
- STDIN.set_encoding(Encoding::UTF_8).each_codepoint{|i| c = i}
- rescue ArgumentError => e
- STDERR.puts e.message
- else
- printf "%x", c
- end
- end;
- args = ['-e', code]
bug11444 = '[ruby-core:70379] [Bug #11444]'
- assert_in_out_err(args, "\u{1f376}".b[0,3], [],
- ["invalid byte sequence in UTF-8"],
- bug11444, timeout: 1)
- assert_in_out_err(args, "x"*8190+"\u{1f376}", ["1f376"], [],
- bug11444, timeout: 1)
+ tests = [
+ ["incomplete multibyte", "\u{1f376}".b[0,3], [], ["invalid byte sequence in UTF-8"]],
+ ["multibyte at boundary", "x"*8190+"\u{1f376}", ["1f376"], []],
+ ]
+ failure = []
+ ["bin", "text"].product(tests) do |mode, (test, data, out, err)|
+ code = <<-"end;"
+ c = nil
+ begin
+ open(ARGV[0], "r#{mode[0]}:utf-8") do |f|
+ f.each_codepoint{|i| c = i}
+ end
+ rescue ArgumentError => e
+ STDERR.puts e.message
+ else
+ printf "%x", c
+ end
+ end;
+ Tempfile.create("codepoint") do |f|
+ args = ['-e', code, f.path]
+ f.print data
+ f.close
+ begin
+ assert_in_out_err(args, "", out, err,
+ "#{bug11444}: #{test} in #{mode} mode",
+ timeout: 1)
+ rescue Exception => e
+ failure << e
+ end
+ end
+ end
+ unless failure.empty?
+ flunk failure.join("\n---\n")
+ end
end
end