mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-25 03:04:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-41894: Fix UnicodeDecodeError while loading native module (GH-22466)

Browse source 
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>
This commit is contained in:
Kevin Adler 2020-10-14 20:53:27 -05:00 • committed by GitHub
parent c13b847a6f
commit 2d2af320d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Python/dynload_hpux.c
View file

@ -36,9 +36,20 @@ dl_funcptr _PyImport_FindSharedFuncptr(const char *prefix,
char buf[256];
PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s",
pathname);
PyObject *buf_ob = PyUnicode_FromString(buf);
PyObject *buf_ob = PyUnicode_DecodeFSDefault(buf);
if (buf_ob == NULL)
return NULL;
PyObject *shortname_ob = PyUnicode_FromString(shortname);
PyObject *pathname_ob = PyUnicode_FromString(pathname);
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);