mirror of
https://github.com/python/cpython
synced 2024-10-14 10:33:27 +00:00
2d2af320d9
When running in a non-UTF-8 locale, if an error occurs while importing a native Python module (say because a dependent share library is missing), the error message string returned may contain non-ASCII code points causing a UnicodeDecodeError. PyUnicode_DecodeFSDefault is used for buffers which may contain filesystem paths. For consistency with os.strerror(), PyUnicode_DecodeLocale is used for buffers which contain system error messages. While the shortname parameter is always encoded in ASCII according to PEP 489, it is left decoded using PyUnicode_FromString to minimize the changes and since it should not affect the decoding (albeit _potentially_ slower). In dynload_hpux, since the error buffer contains a message generated from a static ASCII string and the module filesystem path, PyUnicode_DecodeFSDefault is used instead of PyUnicode_DecodeLocale as is used elsewhere. * bpo-41894: Fix bugs in dynload error msg handling For both dynload_aix and dynload_hpux, properly handle the possibility that decoding strings may return NULL and when such an error happens, properly decrement any previously decoded strings and return early. In addition, in dynload_aix, ensure that we pass the decoded string *object* pathname_ob to PyErr_SetImportError instead of the original pathname buffer. Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
77 lines
2.1 KiB
C
77 lines
2.1 KiB
C
|
|
/* Support for dynamic loading of extension modules */
|
|
|
|
#include "dl.h"
|
|
#include <errno.h>
|
|
|
|
#include "Python.h"
|
|
#include "importdl.h"
|
|
|
|
#if defined(__hp9000s300)
|
|
#define FUNCNAME_PATTERN "_%.20s_%.200s"
|
|
#else
|
|
#define FUNCNAME_PATTERN "%.20s_%.200s"
|
|
#endif
|
|
|
|
const char *_PyImport_DynLoadFiletab[] = {SHLIB_EXT, NULL};
|
|
|
|
dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix,
|
|
const char *shortname,
|
|
const char *pathname, FILE *fp)
|
|
{
|
|
int flags = BIND_FIRST | BIND_DEFERRED;
|
|
int verbose = _Py_GetConfig()->verbose;
|
|
if (verbose) {
|
|
flags = BIND_FIRST | BIND_IMMEDIATE |
|
|
BIND_NONFATAL | BIND_VERBOSE;
|
|
printf("shl_load %s\n",pathname);
|
|
}
|
|
|
|
shl_t lib = shl_load(pathname, flags, 0);
|
|
/* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */
|
|
if (lib == NULL) {
|
|
if (verbose) {
|
|
perror(pathname);
|
|
}
|
|
char buf[256];
|
|
PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s",
|
|
pathname);
|
|
PyObject *buf_ob = PyUnicode_DecodeFSDefault(buf);
|
|
if (buf_ob == NULL)
|
|
return NULL;
|
|
PyObject *shortname_ob = PyUnicode_FromString(shortname);
|
|
if (shortname_ob == NULL) {
|
|
Py_DECREF(buf_ob);
|
|
return NULL;
|
|
}
|
|
PyObject *pathname_ob = PyUnicode_DecodeFSDefault(pathname);
|
|
if (pathname_ob == NULL) {
|
|
Py_DECREF(buf_ob);
|
|
Py_DECREF(shortname_ob);
|
|
return NULL;
|
|
}
|
|
PyErr_SetImportError(buf_ob, shortname_ob, pathname_ob);
|
|
Py_DECREF(buf_ob);
|
|
Py_DECREF(shortname_ob);
|
|
Py_DECREF(pathname_ob);
|
|
return NULL;
|
|
}
|
|
|
|
char funcname[258];
|
|
PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN,
|
|
prefix, shortname);
|
|
if (verbose) {
|
|
printf("shl_findsym %s\n", funcname);
|
|
}
|
|
|
|
dl_funcptr p;
|
|
if (shl_findsym(&lib, funcname, TYPE_UNDEFINED, (void *) &p) == -1) {
|
|
shl_unload(lib);
|
|
p = NULL;
|
|
}
|
|
if (p == NULL && verbose) {
|
|
perror(funcname);
|
|
}
|
|
return p;
|
|
}
|