[Python-checkins] r82696 - python/branches/import_unicode/Python/import.c

victor.stinner python-checkins at python.org
Fri Jul 9 01:32:59 CEST 2010


Author: victor.stinner
Date: Fri Jul  9 01:32:58 2010
New Revision: 82696

Log:
PyWin_FindRegisteredModule() uses its own buffer

Modified:
   python/branches/import_unicode/Python/import.c

Modified: python/branches/import_unicode/Python/import.c
==============================================================================
--- python/branches/import_unicode/Python/import.c	(original)
+++ python/branches/import_unicode/Python/import.c	Fri Jul  9 01:32:58 2010
@@ -1710,6 +1710,10 @@
     }
 
     if (search_path == NULL) {
+#ifdef MS_COREDLL
+        /* FIXME: use buf buffer */
+        char bbuf[MAXPATHLEN+1];
+#endif
         if (is_builtin(name)) {
             *path = PyUnicode_DecodeFSDefault(name);
             if (*path == NULL)
@@ -1717,9 +1721,9 @@
             return &fd_builtin;
         }
 #ifdef MS_COREDLL
-        fp = PyWin_FindRegisteredModule(name, &fdp, buf, buflen);
+        fp = PyWin_FindRegisteredModule(name, &fdp, bbuf, sizeof(bbuf));
         if (fp != NULL) {
-            *path = PyUnicode_DecodeFSDefault(buf);
+            *path = PyUnicode_DecodeFSDefault(bbuf);
             if (*path == NULL) {
                 fclose(fp);
                 return NULL;


More information about the Python-checkins mailing list