Staging
v0.5.1
v0.5.1
https://github.com/python/cpython
Revision 47ca6799725bb4c40953bb26ebcd726d1d766361 authored by Miss Skeleton (bot) on 15 October 2020, 02:11:08 UTC, committed by GitHub on 15 October 2020, 02:11:08 UTC
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> (cherry picked from commit 2d2af320d94afc6561e8f8adf174c9d3fd9065bc) Co-authored-by: Kevin Adler <kadler@us.ibm.com>
1 parent 8b4642d
Tip revision: 47ca6799725bb4c40953bb26ebcd726d1d766361 authored by Miss Skeleton (bot) on 15 October 2020, 02:11:08 UTC
bpo-41894: Fix UnicodeDecodeError while loading native module (GH-22466)
bpo-41894: Fix UnicodeDecodeError while loading native module (GH-22466)
Tip revision: 47ca679
File | Mode | Size |
---|---|---|
debughelpers.c | -rw-r--r-- | 6.3 KB |
Computing file changes ...