1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure paths NUL-terminated

Browse Source 
* dir.c (check_dirname): ensure path name NUL-terminated for
  SHARABLE_MIDDLE_SUBSTRING.
* io.c (rb_sysopen): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-06-30 14:11:56 +00:00
parent 24a72a177d
commit 347da440cf
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Jun 30 23:11:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (check_dirname): ensure path name NUL-terminated for
SHARABLE_MIDDLE_SUBSTRING.
* io.c (rb_sysopen): ditto.
Tue Jun 30 18:38:16 2015 NAKAMURA Usaku <usa@ruby-lang.org> Tue Jun 30 18:38:16 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/file.c (rb_freopen): need to terminate by NUL. * win32/file.c (rb_freopen): need to terminate by NUL.

1
dir.c
View File

@ -1019,6 +1019,7 @@ check_dirname(VALUE dir)
pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc); pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc);
if (pend - path < len) { if (pend - path < len) {
d = rb_str_subseq(d, 0, pend - path); d = rb_str_subseq(d, 0, pend - path);
StringValueCStr(d);
} }
return rb_str_encode_ospath(d); return rb_str_encode_ospath(d);
} }

1
io.c
View File

@ -5444,6 +5444,7 @@ rb_sysopen(VALUE fname, int oflags, mode_t perm)
struct sysopen_struct data; struct sysopen_struct data;
data.fname = rb_str_encode_ospath(fname); data.fname = rb_str_encode_ospath(fname);
StringValueCStr(data.fname);
data.oflags = oflags; data.oflags = oflags;
data.perm = perm; data.perm = perm;