merge revision(s) 51594: [Backport #11444]

	* 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/branches/ruby_2_2@52804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 52 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index c6c46c98fd..54ab2fbb36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec  1 02:27:41 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 Nov 29 18:02:44 2015  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* io.c (argf_getpartial): should not resize str if the second
diff --git a/NEWS b/NEWS
index b4ef080249..b909208924 100644
--- a/NEWS
+++ b/NEWS
@@ -111,6 +111,8 @@ with all sufficient information, see the ChangeLog file.
       of the file is updated immediately.  On some platforms (especially
       Windows), it is delayed until the filesystem load is decreased.
       Use IO#fsync if you want to guarantee updating metadata.
+  * IO#each_codepoint raises an exception at incomplete character
+    before EOF when conversion takes place.  [Bug #11444]
 
 * Math
   * incompatible changes:
diff --git a/io.c b/io.c
index 511ff2615a..c46a2a583a 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 17a427a12b..054aef4289 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
@@ -2565,22 +2566,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
diff --git a/version.h b/version.h
index 198e0ce9fe..70e596d642 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-11-29"
-#define RUBY_PATCHLEVEL 214
+#define RUBY_RELEASE_DATE "2015-12-01"
+#define RUBY_PATCHLEVEL 215
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"