From cb4e2b590eff76446023ce2305d82b9487df64ae Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 14 Aug 2012 07:05:12 +0000
Subject: * win32/win32.c (check_valid_dir): reject "..." as directory name.  
 [Bug #6851]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/win32.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'win32/win32.c')

diff --git a/win32/win32.c b/win32/win32.c
index de655df8b3..7eaf1fc788 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4556,11 +4556,18 @@ check_valid_dir(const WCHAR *path)
     HANDLE fh;
     WCHAR full[MAX_PATH];
     WCHAR *dmy;
+    WCHAR *p, *q;
 
     /* GetFileAttributes() determines "..." as directory. */
     /* We recheck it by FindFirstFile(). */
-    if (wcsstr(path, L"...") == NULL)
+    if (!(p = wcsstr(path, L"...")))
 	return 0;
+    q = p + wcsspn(p, L".");
+    if ((p == path || wcschr(L":/\\", *(p - 1))) &&
+	(!*q || wcschr(L":/\\", *q))) {
+	errno = ENOENT;
+	return -1;
+    }
 
     /* if the specified path is the root of a drive and the drive is empty, */
     /* FindFirstFile() returns INVALID_HANDLE_VALUE. */
-- 
cgit v1.2.3