summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-15 04:11:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-15 04:11:34 +0000
commit539a9d60e822cb7383222e95e8bc8f00ca232e55 (patch)
tree2d658d206c9a8f86a2bb7ce62d5ca2d08c566c95
parentfcf33bd0eacefa76a415ca046f06e2f20400d30b (diff)
downloadruby-539a9d60e822cb7383222e95e8bc8f00ca232e55.tar.gz
ruby-539a9d60e822cb7383222e95e8bc8f00ca232e55.tar.xz
ruby-539a9d60e822cb7383222e95e8bc8f00ca232e55.zip
commit miss
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--dir.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 36910886f..0e93322f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Mon Dec 15 13:06:58 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 15 13:11:32 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (check_dirname): check string safety and remove extraneous
trailing directory separators. [ruby-dev:22279]
diff --git a/dir.c b/dir.c
index e1764c758..857244180 100644
--- a/dir.c
+++ b/dir.c
@@ -508,7 +508,7 @@ check_dirname(dir)
SafeStringValue(*dir);
rb_secure(2);
path = RSTRING(*dir)->ptr;
- if (*(path && pend = rb_path_end(rb_path_skip_prefix(path)))) {
+ if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
*dir = rb_str_new(path, pend - path);
}
}