diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win32/win32.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Oct 25 18:35:39 2004 WATANABE Hirofumi <eban@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * 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; } } |