summaryrefslogtreecommitdiff
path: root/io.c
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 /io.c
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
Diffstat (limited to 'io.c')
-rw-r--r--io.c9
1 files changed, 6 insertions, 3 deletions
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) {