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_next.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_next.c')
| -rw-r--r-- | Python/dynload_next.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/dynload_next.c b/Python/dynload_next.c index 85c95b41bb..83a8b2bb31 100644 --- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -27,8 +27,9 @@ const char *_PyImport_DynLoadFiletab[] = {".so", NULL}; #define LINKOPTIONS NSLINKMODULE_OPTION_BINDNOW| \ NSLINKMODULE_OPTION_RETURN_ON_ERROR|NSLINKMODULE_OPTION_PRIVATE #endif -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 = NULL; char funcname[258]; @@ -39,7 +40,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, const char *errString; char errBuf[512]; - PyOS_snprintf(funcname, sizeof(funcname), "_PyInit_%.200s", shortname); + PyOS_snprintf(funcname, sizeof(funcname), "_%.20s_%.200s", prefix, shortname); #ifdef USE_DYLD_GLOBAL_NAMESPACE if (NSIsSymbolNameDefined(funcname)) { |