Commit adc2fb8a authored by Steve Dower's avatar Steve Dower

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

parent c7792160
......@@ -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);
}
......@@ -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};
......
......@@ -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)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment