From 8b2af0d04f7853e7aafd36ea444f2c8fca79c208 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 6 Sep 2008 22:15:18 +0000 Subject: * 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 --- ChangeLog | 5 +++++ file.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34d11eb65..6a7c2f9ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 7 06:31:51 2008 Yukihiro Matsumoto + + * 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 * parse.y (f_block_optarg): allow default for block parameters as diff --git a/file.c b/file.c index 33327a6f9..dbaafd2e8 100644 --- a/file.c +++ b/file.c @@ -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 = '/'; } -- cgit