jruby · Mar 3, 2016 · Mar 3, 2016 · Mar 3, 2016
Showing with 10 additions and 6 deletions.

+7 −2 core/src/main/java/org/jruby/RubyIO.java

+2 −2 lib/pom.xml

+0 −1 test/mri/excludes/TestIO_M17N.rb

+1 −1 test/mri/ruby/test_io_m17n.rb
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -3142,6 +3142,7 @@ private IRubyObject eachCodePointCommon(ThreadContext context, Block block, Stri
             fptr.READ_CHECK(context);
             if (fptr.needsReadConversion()) {
                 fptr.SET_BINARY_MODE();
+                r = 1;		/* no invalid char yet */
                 for (;;) {
                     fptr.makeReadConversion(context);
                     for (;;) {
@@ -3158,12 +3159,16 @@ private IRubyObject eachCodePointCommon(ThreadContext context, Block block, Stri
                         }
                         if (fptr.moreChar(context) == OpenFile.MORE_CHAR_FINISHED) {
                             fptr.clearReadConversion();
-                            /* ignore an incomplete character before EOF */
+                            if (!StringSupport.MBCLEN_CHARFOUND_P(r)) {
+                                enc = fptr.encs.enc;
+                                throw runtime.newArgumentError("invalid byte sequence in " + enc.toString());
+                            }
                             return this;
                         }
                     }
                     if (StringSupport.MBCLEN_INVALID_P(r)) {
-                        throw runtime.newArgumentError("invalid byte sequence in " + fptr.encs.enc.toString());
+                        enc = fptr.encs.enc;
+                        throw runtime.newArgumentError("invalid byte sequence in " + enc.toString());
                     }
                     n = StringSupport.MBCLEN_CHARFOUND_LEN(r);
                     if (fptr.encs.enc != null) {

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -276,7 +276,7 @@ DO NOT MODIFIY - GENERATED CODE
       <plugin>
         <groupId>io.takari.polyglot</groupId>
         <artifactId>polyglot-maven-plugin</artifactId>
-        <version>0.1.15</version>
+        <version>0.1.11</version>
         <executions>
           <execution>
             <id>install_gems</id>
@@ -327,7 +327,7 @@ DO NOT MODIFIY - GENERATED CODE
           <dependency>
             <groupId>io.takari.polyglot</groupId>
             <artifactId>polyglot-ruby</artifactId>
-            <version>0.1.15</version>
+            <version>0.1.11</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/test/mri/excludes/TestIO_M17N.rb b/test/mri/excludes/TestIO_M17N.rb
@@ -1,6 +1,5 @@
 exclude :test_both_textmode_binmode, "needs investigation"
 exclude :test_cbuf, "needs investigation"
-exclude :test_each_codepoint_need_more, "times out, but doesn't pass even with longer timeout"
 exclude :test_error_nonascii, "needs investigation"
 exclude :test_getc_newlineconv_invalid, "needs investigation"
 exclude :test_inspect_nonascii, "needs investigation"

diff --git a/test/mri/ruby/test_io_m17n.rb b/test/mri/ruby/test_io_m17n.rb
@@ -2626,7 +2626,7 @@ def test_each_codepoint_need_more
         begin
           assert_in_out_err(args, "", out, err,
                             "#{bug11444}: #{test} in #{mode} mode",
-                            timeout: 1)
+                            timeout: 10)
         rescue Exception => e
           failure << e
         end