From b088595db7298ce80bc33e982450d97ec6d1ef62 Mon Sep 17 00:00:00 2001 From: eban Date: Mon, 25 Oct 2004 09:40:55 +0000 Subject: * win32/win32.c (isUNCRoot): should check NUL after '.'. [ruby-dev:24590] * win32/win32.c (isUNCRoot): fixed buffer overrun. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ win32/win32.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29878e1f65..8c38707438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Oct 25 18:35:39 2004 WATANABE Hirofumi + + * win32/win32.c (isUNCRoot): should check NUL after '.'. + [ruby-dev:24590] + + * win32/win32.c (isUNCRoot): fixed buffer overrun. + Mon Oct 25 08:03:26 2004 Nobuyoshi Nakada * eval.c (get_backtrace): ignore illegal backtrace. [ruby-dev:24587] diff --git a/win32/win32.c b/win32/win32.c index 1363d78710..b2f4695a96 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2811,7 +2811,7 @@ isUNCRoot(const char *path) { if (path[0] == '\\' && path[1] == '\\') { const char *p; - for (p = path + 3; *p; p = CharNext(p)) { + for (p = path + 2; *p; p = CharNext(p)) { if (*p == '\\') break; } @@ -2820,7 +2820,7 @@ isUNCRoot(const char *path) if (*p == '\\') break; } - if (!p[0] || !p[1] || (p[0] == '\\' && p[1] == '.')) + if (!p[0] || !p[1] || (p[1] == '.' && !p[2])) return 1; } } -- cgit v1.2.3