akr	2009-11-18 07:52:02 +0900 (Wed, 18 Nov 2009)

  New Revision: 25827

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25827

  Log:
    * io.c (parse_mode_enc): fix invalid access.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25826)
+++ ChangeLog	(revision 25827)
@@ -1,3 +1,7 @@
+Wed Nov 18 07:51:01 2009  Tanaka Akira  <akr@f...>
+
+	* io.c (parse_mode_enc): fix invalid access.
+
 Tue Nov 17 23:50:06 2009  Shugo Maeda  <shugo@r...>
 
 	* vm_method.c (rb_alias): should raise TypeError if klass is nil.
Index: io.c
===================================================================
--- io.c	(revision 25826)
+++ io.c	(revision 25827)
@@ -4155,8 +4155,10 @@
 	if (len == 0 || len > ENCODING_MAXNAMELEN)
 	    idx = -1;
 	else {
-	    if (io_encname_bom_p(estr, len))
+	    if (io_encname_bom_p(estr, len)) {
 		estr += 4;
+                len -= 4;
+            }
 	    memcpy(encname, estr, len);
 	    encname[len] = '\0';
 	    estr = encname;
@@ -4167,6 +4169,7 @@
 	long len = strlen(estr);
 	if (io_encname_bom_p(estr, len)) {
 	    estr += 4;
+            len -= 4;
 	    memcpy(encname, estr, len);
 	    encname[len] = '\0';
 	    estr = encname;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/