kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-11-17 22:52:02 +00:00
parent 86d46b5459
commit cde9a50b75
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Nov 18 07:51:01 2009 Tanaka Akira <akr@fsij.org>
* io.c (parse_mode_enc): fix invalid access.
Tue Nov 17 23:50:06 2009 Shugo Maeda <shugo@ruby-lang.org> Tue Nov 17 23:50:06 2009 Shugo Maeda <shugo@ruby-lang.org>
* vm_method.c (rb_alias): should raise TypeError if klass is nil. * vm_method.c (rb_alias): should raise TypeError if klass is nil.

5
io.c
View file

@ -4155,8 +4155,10 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p)
if (len == 0 || len > ENCODING_MAXNAMELEN) if (len == 0 || len > ENCODING_MAXNAMELEN)
idx = -1; idx = -1;
else { else {
if (io_encname_bom_p(estr, len)) if (io_encname_bom_p(estr, len)) {
estr += 4; estr += 4;
len -= 4;
}
memcpy(encname, estr, len); memcpy(encname, estr, len);
encname[len] = '\0'; encname[len] = '\0';
estr = encname; estr = encname;
@ -4167,6 +4169,7 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p)
long len = strlen(estr); long len = strlen(estr);
if (io_encname_bom_p(estr, len)) { if (io_encname_bom_p(estr, len)) {
estr += 4; estr += 4;
len -= 4;
memcpy(encname, estr, len); memcpy(encname, estr, len);
encname[len] = '\0'; encname[len] = '\0';
estr = encname; estr = encname;