1999-12-20 17:18:49 -04:00
|
|
|
|
|
|
|
/* Support for dynamic loading of extension modules */
|
|
|
|
|
|
|
|
#include "dl.h"
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
#include "Python.h"
|
|
|
|
#include "importdl.h"
|
|
|
|
|
1999-12-22 10:09:35 -04:00
|
|
|
#if defined(__hp9000s300)
|
2015-05-23 18:13:41 -03:00
|
|
|
#define FUNCNAME_PATTERN "_%.20s_%.200s"
|
1999-12-22 10:09:35 -04:00
|
|
|
#else
|
2015-05-23 18:13:41 -03:00
|
|
|
#define FUNCNAME_PATTERN "%.20s_%.200s"
|
1999-12-22 10:09:35 -04:00
|
|
|
#endif
|
1999-12-20 17:18:49 -04:00
|
|
|
|
2012-05-04 16:20:40 -03:00
|
|
|
const char *_PyImport_DynLoadFiletab[] = {SHLIB_EXT, NULL};
|
1999-12-20 17:18:49 -04:00
|
|
|
|
2015-05-23 09:24:10 -03:00
|
|
|
dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix,
|
|
|
|
const char *shortname,
|
|
|
|
const char *pathname, FILE *fp)
|
1999-12-20 17:18:49 -04:00
|
|
|
{
|
2019-05-14 12:34:56 -03:00
|
|
|
int flags = BIND_FIRST | BIND_DEFERRED;
|
2020-04-12 22:04:28 -03:00
|
|
|
int verbose = _Py_GetConfig()->verbose;
|
2019-05-14 12:34:56 -03:00
|
|
|
if (verbose) {
|
2010-05-09 12:52:27 -03:00
|
|
|
flags = BIND_FIRST | BIND_IMMEDIATE |
|
|
|
|
BIND_NONFATAL | BIND_VERBOSE;
|
|
|
|
printf("shl_load %s\n",pathname);
|
|
|
|
}
|
2019-05-14 12:34:56 -03:00
|
|
|
|
|
|
|
shl_t lib = shl_load(pathname, flags, 0);
|
2010-05-09 12:52:27 -03:00
|
|
|
/* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */
|
|
|
|
if (lib == NULL) {
|
2019-05-14 12:34:56 -03:00
|
|
|
if (verbose) {
|
2010-05-09 12:52:27 -03:00
|
|
|
perror(pathname);
|
2019-05-14 12:34:56 -03:00
|
|
|
}
|
|
|
|
char buf[256];
|
2010-05-09 12:52:27 -03:00
|
|
|
PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s",
|
|
|
|
pathname);
|
bpo-41894: Fix UnicodeDecodeError while loading native module (GH-22466)
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>
2020-10-14 22:53:27 -03:00
|
|
|
PyObject *buf_ob = PyUnicode_DecodeFSDefault(buf);
|
|
|
|
if (buf_ob == NULL)
|
|
|
|
return NULL;
|
2019-05-14 12:34:56 -03:00
|
|
|
PyObject *shortname_ob = PyUnicode_FromString(shortname);
|
bpo-41894: Fix UnicodeDecodeError while loading native module (GH-22466)
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>
2020-10-14 22:53:27 -03:00
|
|
|
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;
|
|
|
|
}
|
2012-04-20 16:31:11 -03:00
|
|
|
PyErr_SetImportError(buf_ob, shortname_ob, pathname_ob);
|
|
|
|
Py_DECREF(buf_ob);
|
|
|
|
Py_DECREF(shortname_ob);
|
|
|
|
Py_DECREF(pathname_ob);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2019-05-14 12:34:56 -03:00
|
|
|
|
|
|
|
char funcname[258];
|
2015-05-23 09:24:10 -03:00
|
|
|
PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN,
|
|
|
|
prefix, shortname);
|
2019-05-14 12:34:56 -03:00
|
|
|
if (verbose) {
|
2010-05-09 12:52:27 -03:00
|
|
|
printf("shl_findsym %s\n", funcname);
|
2019-05-14 12:34:56 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
dl_funcptr p;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (shl_findsym(&lib, funcname, TYPE_UNDEFINED, (void *) &p) == -1) {
|
|
|
|
shl_unload(lib);
|
|
|
|
p = NULL;
|
|
|
|
}
|
2019-05-14 12:34:56 -03:00
|
|
|
if (p == NULL && verbose) {
|
2010-05-09 12:52:27 -03:00
|
|
|
perror(funcname);
|
2019-05-14 12:34:56 -03:00
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
return p;
|
1999-12-20 17:18:49 -04:00
|
|
|
}
|