X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinsftp.c;h=ff471dd5c874eb8dbb92a3085982c602192c9f50;hb=8316deb3399fe1d0c406132cf2e795a76de26b64;hp=c0712571481c7974692598c3ace7413a93a06891;hpb=f1585f8f46fda41bb7707e507760d48e963c24b9;p=PuTTY.git

diff --git a/windows/winsftp.c b/windows/winsftp.c
index c0712571..ff471dd5 100644
--- a/windows/winsftp.c
+++ b/windows/winsftp.c
@@ -306,20 +306,26 @@ DirHandle *open_directory(char *name)
 
 char *read_filename(DirHandle *dir)
 {
-    while (!dir->name) {
-	WIN32_FIND_DATA fdat;
-	int ok = FindNextFile(dir->h, &fdat);
+    do {
 
-	if (!ok)
-	    return NULL;
+	if (!dir->name) {
+	    WIN32_FIND_DATA fdat;
+	    int ok = FindNextFile(dir->h, &fdat);
+	    if (!ok)
+		return NULL;
+	    else
+		dir->name = dupstr(fdat.cFileName);
+	}
 
-	if (fdat.cFileName[0] == '.' &&
-	    (fdat.cFileName[1] == '\0' ||
-	     (fdat.cFileName[1] == '.' && fdat.cFileName[2] == '\0')))
+	assert(dir->name);
+	if (dir->name[0] == '.' &&
+	    (dir->name[1] == '\0' ||
+	     (dir->name[1] == '.' && dir->name[2] == '\0'))) {
+	    sfree(dir->name);
 	    dir->name = NULL;
-	else
-	    dir->name = dupstr(fdat.cFileName);
-    }
+	}
+
+    } while (!dir->name);
 
     if (dir->name) {
 	char *ret = dir->name;
@@ -445,6 +451,17 @@ void finish_wildcard_matching(WildcardMatcher *dir)
     sfree(dir);
 }
 
+int vet_filename(char *name)
+{
+    if (strchr(name, '/') || strchr(name, '\\') || strchr(name, ':'))
+	return FALSE;
+
+    if (!name[strspn(name, ".")])      /* entirely composed of dots */
+	return FALSE;
+
+    return TRUE;
+}
+
 int create_directory(char *name)
 {
     return CreateDirectory(name, NULL) != 0;