summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-17 22:52:02 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-17 22:52:02 +0000
commitcde9a50b7528d3b400b9f966b28919ec3ab6ea86 (patch)
tree7aad0196128611677120a5d85020581ae5de7c6f /io.c
parent86d46b5459cda15a616e29934b1ddfe4ec788735 (diff)
* 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
Diffstat (limited to 'io.c')
-rw-r--r--io.c5
1 files changed, 4 insertions, 1 deletions
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;