From cde9a50b7528d3b400b9f966b28919ec3ab6ea86 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 17 Nov 2009 22:52:02 +0000 Subject: [PATCH] * io.c (parse_mode_enc): fix invalid access. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff3c1c0c2f..a7e0c62683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 18 07:51:01 2009 Tanaka Akira + + * io.c (parse_mode_enc): fix invalid access. + Tue Nov 17 23:50:06 2009 Shugo Maeda * vm_method.c (rb_alias): should raise TypeError if klass is nil. diff --git a/io.c b/io.c index 17ee292f5b..dc3a796587 100644 --- a/io.c +++ b/io.c @@ -4155,8 +4155,10 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p) 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 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p) long len = strlen(estr); if (io_encname_bom_p(estr, len)) { estr += 4; + len -= 4; memcpy(encname, estr, len); encname[len] = '\0'; estr = encname;