Subject: Bug in PC/import_nt.c

gvanrossum · gvanrossum · commit 76ec53c64df4 · 1998-06-15T18:01:34.000Z
From: Dan Pierson &lt;dan@remote.control.com&gt;
To: "Mark Hammond (E-mail)" &lt;MHammond@skippinet.com.au&gt;,
    "Guido van Rossum (E-mail)" &lt;guido@cnri.reston.va.us&gt;
Date: Mon, 8 Jun 1998 17:25:07 -0400

RegistryQueryValue requires that its fourth argument be initialized to
the length of the buffer being passed in, this wasn't being done.  I
also split the call and status test into two lines with a local variable
so that I could look at the status in the debugger.
diff --git a/PC/import_nt.c b/PC/import_nt.c
@@ -45,6 +45,7 @@ FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppF
 	FILE *fp;
 	HKEY keyBase = PyWin_IsWin32s() ? HKEY_CLASSES_ROOT : HKEY_LOCAL_MACHINE;
 	int modNameSize;
+	long regStat;
 
 	// Calculate the size for the sprintf buffer.
 	// Get the size of the chars only, plus 1 NULL.
@@ -53,7 +54,9 @@ FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppF
 	moduleKey = alloca(bufSize); 
 	sprintf(moduleKey, "Software\\Python\\PythonCore\\%s\\Modules\\%s%s", PyWin_DLLVersionString, moduleName, debugString);
 
-	if (RegQueryValue(keyBase, moduleKey, pathBuf, &modNameSize)!=ERROR_SUCCESS)
+	modNameSize = bufSize;
+	regStat = RegQueryValue(keyBase, moduleKey, pathBuf, &modNameSize);
+	if (regStat!=ERROR_SUCCESS)
 		return NULL;
 	// use the file extension to locate the type entry.
 	for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
