[Python-checkins] r42903 - python/trunk/Modules/posixmodule.c

[georg.brandl]

Author: georg.brandl
Date: Tue Mar  7 21:56:02 2006
New Revision: 42903

Modified:
   python/trunk/Modules/posixmodule.c
Log:
Fix bug introduced in rev. 42884.



Modified: python/trunk/Modules/posixmodule.c
==============================================================================
--- python/trunk/Modules/posixmodule.c	(original)
+++ python/trunk/Modules/posixmodule.c	Tue Mar  7 21:56:02 2006
@@ -1640,7 +1640,7 @@
 
 	PyObject *d, *v;
 	HANDLE hFindFile;
-	BOOL result;
+	BOOL result = FALSE;
 	WIN32_FIND_DATA FileData;
 	/* MAX_PATH characters could mean a bigger encoded string */
 	char namebuf[MAX_PATH*2+5];
@@ -1679,7 +1679,7 @@
 					(wFileData.cFileName[1] == L'\0' ||
 					 wFileData.cFileName[1] == L'.' &&
 					 wFileData.cFileName[2] == L'\0'))
-					continue;
+					goto loop_w;
 				v = PyUnicode_FromUnicode(wFileData.cFileName, wcslen(wFileData.cFileName));
 				if (v == NULL) {
 					Py_DECREF(d);
@@ -1693,6 +1693,7 @@
 					break;
 				}
 				Py_DECREF(v);
+loop_w:
 				Py_BEGIN_ALLOW_THREADS
 				result = FindNextFileW(hFindFile, &wFileData);
 				Py_END_ALLOW_THREADS
@@ -1736,7 +1737,7 @@
 		    (FileData.cFileName[1] == '\0' ||
 		     FileData.cFileName[1] == '.' &&
 		     FileData.cFileName[2] == '\0'))
-			continue;
+			goto loop_a;
 		v = PyString_FromString(FileData.cFileName);
 		if (v == NULL) {
 			Py_DECREF(d);
@@ -1750,6 +1751,7 @@
 			break;
 		}
 		Py_DECREF(v);
+loop_a:
 		Py_BEGIN_ALLOW_THREADS
 		result = FindNextFile(hFindFile, &FileData);
 		Py_END_ALLOW_THREADS