Issue #24268: Fix import naming when loading extension modules. Patch by Petr Viktorin.

zooba · zooba · commit adc2fb8a6a8d · 2015-05-23T14:13:41.000-07:00
diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
@@ -18,6 +18,6 @@ dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix,
 {
     char funcname[258];
 
-    PyOS_snprintf(funcname, sizeof(funcname), "%20s_%.200s", prefix, shortname);
+    PyOS_snprintf(funcname, sizeof(funcname), "%.20s_%.200s", prefix, shortname);
     return dl_loadmod(Py_GetProgramName(), pathname, funcname);
 }
diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c
@@ -8,9 +8,9 @@
 #include "importdl.h"
 
 #if defined(__hp9000s300)
-#define FUNCNAME_PATTERN "_%20s_%.200s"
+#define FUNCNAME_PATTERN "_%.20s_%.200s"
 #else
-#define FUNCNAME_PATTERN "%20s_%.200s"
+#define FUNCNAME_PATTERN "%.20s_%.200s"
 #endif
 
 const char *_PyImport_DynLoadFiletab[] = {SHLIB_EXT, NULL};
diff --git a/Python/dynload_next.c b/Python/dynload_next.c
@@ -40,7 +40,7 @@ dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix,
     const char *errString;
     char errBuf[512];
 
-    PyOS_snprintf(funcname, sizeof(funcname), "_%20s_%.200s", prefix, shortname);
+    PyOS_snprintf(funcname, sizeof(funcname), "_%.20s_%.200s", prefix, shortname);
 
 #ifdef USE_DYLD_GLOBAL_NAMESPACE
     if (NSIsSymbolNameDefined(funcname)) {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix,`
`18`	`18`	`{`
`19`	`19`	`char funcname[258];`
`20`	`20`
`21`		`- PyOS_snprintf(funcname, sizeof(funcname), "%20s_%.200s", prefix, shortname);`
	`21`	`+ PyOS_snprintf(funcname, sizeof(funcname), "%.20s_%.200s", prefix, shortname);`
`22`	`22`	`return dl_loadmod(Py_GetProgramName(), pathname, funcname);`
`23`	`23`	`}`