diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-30 14:11:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-30 14:11:56 +0000 |
commit | 2c9596c52122887c7d6dd339ed28922d497fefb8 (patch) | |
tree | 3715717e1516f08d222326233db069e45c3cfdb7 | |
parent | 26ef134e3fa4b027591afd39ae715a0f35b32ebb (diff) | |
download | ruby-2c9596c52122887c7d6dd339ed28922d497fefb8.tar.gz |
ensure paths NUL-terminated
* 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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | dir.c | 1 | ||||
-rw-r--r-- | io.c | 1 |
3 files changed, 9 insertions, 0 deletions
@@ -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> * win32/file.c (rb_freopen): need to terminate by NUL. @@ -1019,6 +1019,7 @@ check_dirname(VALUE dir) pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc); if (pend - path < len) { d = rb_str_subseq(d, 0, pend - path); + StringValueCStr(d); } return rb_str_encode_ospath(d); } @@ -5444,6 +5444,7 @@ rb_sysopen(VALUE fname, int oflags, mode_t perm) struct sysopen_struct data; data.fname = rb_str_encode_ospath(fname); + StringValueCStr(data.fname); data.oflags = oflags; data.perm = perm; |