From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 23 May 2015 21:13:41 +0000 (-0700)
Subject: Issue #24268: Fix import naming when loading extension modules. Patch by Petr Viktorin.
X-Git-Tag: v3.5.0b1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=adc2fb8a6a8d98f32eea2d1022f14cadfdf915e3;p=python

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

diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
index d235a84c15..2bec645fbd 100644
--- 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
index e28ae7c903..4967afc39c 100644
--- 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
index c555b3802f..83a8b2bb31 100644
--- 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)) {