diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 23:59:20 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 23:59:20 +0000 |
commit | 8b7b9e33a517c09c487cd118ffa9c2efd7bed769 (patch) | |
tree | f932c234dbde4f9f8e00e8dc83388ea9e7b7b3be /file.c | |
parent | f3844ccf44060801c7ceed331efa025d73e8f718 (diff) | |
download | ruby-8b7b9e33a517c09c487cd118ffa9c2efd7bed769.tar.gz |
* file.c (rb_file_s_stat): need type check for non string values.
[ruby-dev:37673] fix: #964
* file.c (rb_file_s_size, rb_file_s_atime, rb_file_s_mtime,
rb_file_s_ctime, rb_f_test): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 29 |
1 files changed, 20 insertions, 9 deletions
@@ -773,7 +773,8 @@ rb_file_s_stat(VALUE klass, VALUE fname) rb_secure(4); FilePathValue(fname); if (rb_stat(fname, &st) < 0) { - rb_sys_fail(StringValueCStr(fname)); + FilePathValue(fname); + rb_sys_fail(RSTRING_PTR(fname)); } return stat_new(&st); } @@ -1590,8 +1591,10 @@ rb_file_s_size(VALUE klass, VALUE fname) { struct stat st; - if (rb_stat(fname, &st) < 0) - rb_sys_fail(StringValueCStr(fname)); + if (rb_stat(fname, &st) < 0) { + FilePathValue(fname); + rb_sys_fail(RSTRING_PTR(fname)); + } return OFFT2NUM(st.st_size); } @@ -1680,8 +1683,10 @@ rb_file_s_atime(VALUE klass, VALUE fname) { struct stat st; - if (rb_stat(fname, &st) < 0) - rb_sys_fail(StringValueCStr(fname)); + if (rb_stat(fname, &st) < 0) { + FilePathValue(fname); + rb_sys_fail(RSTRING_PTR(fname)); + } return stat_atime(&st); } @@ -1724,8 +1729,10 @@ rb_file_s_mtime(VALUE klass, VALUE fname) { struct stat st; - if (rb_stat(fname, &st) < 0) + if (rb_stat(fname, &st) < 0) { + FilePathValue(fname); rb_sys_fail(RSTRING_PTR(fname)); + } return stat_mtime(&st); } @@ -1769,8 +1776,10 @@ rb_file_s_ctime(VALUE klass, VALUE fname) { struct stat st; - if (rb_stat(fname, &st) < 0) + if (rb_stat(fname, &st) < 0) { + FilePathValue(fname); rb_sys_fail(RSTRING_PTR(fname)); + } return stat_ctime(&st); } @@ -3660,10 +3669,12 @@ rb_f_test(int argc, VALUE *argv) if (strchr("MAC", cmd)) { struct stat st; + VALUE fname = argv[1]; CHECK(1); - if (rb_stat(argv[1], &st) == -1) { - rb_sys_fail(RSTRING_PTR(argv[1])); + if (rb_stat(fname, &st) == -1) { + FilePathValue(fname); + rb_sys_fail(RSTRING_PTR(fname)); } switch (cmd) { |