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

diff --git a/windows/winsftp.c b/windows/winsftp.c
index 82bea80d..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;