diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-12 14:35:46 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-12 14:35:46 +0200 |
| commit | b51bd875193c84e51afb907a0c8ff6091fc95d5f (patch) | |
| tree | d2e3c85d92f1ae680f0c90b4b4fc88cce58ecba0 /Python/dynload_hpux.c | |
| parent | e7ed9c7bd2204dd48d67eb7b14813c0338a85a0c (diff) | |
| parent | f246749b9aa9cdb1f05eca29b7eef6a04e05fc8b (diff) | |
| download | cpython-b51bd875193c84e51afb907a0c8ff6091fc95d5f.tar.gz | |
Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X
when decode astral characters.
Diffstat (limited to 'Python/dynload_hpux.c')
| -rw-r--r-- | Python/dynload_hpux.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c index c9554148cc..4967afc39c 100644 --- a/Python/dynload_hpux.c +++ b/Python/dynload_hpux.c @@ -8,15 +8,16 @@ #include "importdl.h" #if defined(__hp9000s300) -#define FUNCNAME_PATTERN "_PyInit_%.200s" +#define FUNCNAME_PATTERN "_%.20s_%.200s" #else -#define FUNCNAME_PATTERN "PyInit_%.200s" +#define FUNCNAME_PATTERN "%.20s_%.200s" #endif const char *_PyImport_DynLoadFiletab[] = {SHLIB_EXT, NULL}; -dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, - const char *pathname, FILE *fp) +dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix, + const char *shortname, + const char *pathname, FILE *fp) { dl_funcptr p; shl_t lib; @@ -50,7 +51,8 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, Py_DECREF(pathname_ob); return NULL; } - PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, shortname); + PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, + prefix, shortname); if (Py_VerboseFlag) printf("shl_findsym %s\n", funcname); if (shl_findsym(&lib, funcname, TYPE_UNDEFINED, (void *) &p) == -1) { |