diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 22:15:18 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 22:15:18 +0000 |
commit | 8b2af0d04f7853e7aafd36ea444f2c8fca79c208 (patch) | |
tree | 21d27518003f532628dc39faf8116c06710c0c07 | |
parent | e55aafe74f477a9b27b04bd1824b501e20bb6e58 (diff) | |
download | ruby-8b2af0d04f7853e7aafd36ea444f2c8fca79c208.tar.gz ruby-8b2af0d04f7853e7aafd36ea444f2c8fca79c208.tar.xz ruby-8b2af0d04f7853e7aafd36ea444f2c8fca79c208.zip |
* file.c (file_expand_path): applied a patch from Nobuhiro Tachino
in [ruby-dev:35948]. fix #491
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Sep 7 06:31:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * file.c (file_expand_path): applied a patch from Nobuhiro Tachino + in [ruby-dev:35948]. fix #491 + Sun Sep 7 03:37:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * parse.y (f_block_optarg): allow default for block parameters as @@ -2728,8 +2728,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) if (p > buf && p[-1] == '/') --p; else { - ++buflen; - BUFCHECK(bdiff >= buflen); + BUFCHECK(bdiff + 1 >= buflen); *p = '/'; } |