merge revision(s) 53083:

	* io.c (parse_mode_enc): fix buffer overflow.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 25 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e19275c6c..41ba44eb62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 16 02:38:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (parse_mode_enc): fix buffer overflow.
+
 Sat Dec 12 17:19:27 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
 	* doc/NEWS-0.2.2: add description about incompatible change in Hash
diff --git a/io.c b/io.c
index c46a2a583a..33b389b82e 100644
--- a/io.c
+++ b/io.c
@@ -5139,9 +5139,11 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int
 	    fmode |= FMODE_SETENC_BY_BOM;
 	    estr += 4;
             len -= 4;
-	    memcpy(encname, estr, len);
-	    encname[len] = '\0';
-	    estr = encname;
+	    if (len > 0 && len <= ENCODING_MAXNAMELEN) {
+		memcpy(encname, estr, len);
+		encname[len] = '\0';
+		estr = encname;
+	    }
 	}
 	idx = rb_enc_find_index(estr);
     }
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb
index 054aef4289..0f1b1644f5 100644
--- a/test/ruby/test_io_m17n.rb
+++ b/test/ruby/test_io_m17n.rb
@@ -2083,6 +2083,19 @@ EOT
     }
   end
 
+  def test_bom_too_long_utfname
+    assert_separately([], <<-'end;') # do
+      assert_warn(/Unsupported encoding/) {
+        open(IO::NULL, "r:bom|utf-" + "x" * 10000) {}
+      }
+    end;
+    assert_separately([], <<-'end;') # do
+      assert_warn(/Unsupported encoding/) {
+        open(IO::NULL, encoding: "bom|utf-" + "x" * 10000) {}
+      }
+    end;
+  end
+
   def test_cbuf
     with_tmpdir {
       fn = "tst"
diff --git a/version.h b/version.h
index c01e28eb2c..7a5eb43456 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-12-12"
-#define RUBY_PATCHLEVEL 228
+#define RUBY_RELEASE_DATE "2015-12-16"
+#define RUBY_PATCHLEVEL 229
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"