Skip to content

[3.9] bpo-41894: Fix UnicodeDecodeError while loading native module (GH-22466) #22704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Oct 15, 2020
Merged

[3.9] bpo-41894: Fix UnicodeDecodeError while loading native module (GH-22466) #22704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2020-10-02-11-35-33.bpo-41894.ffmtOt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
When loading a native module and a load failure occurs, prevent a possible
UnicodeDecodeError when not running in a UTF-8 locale by decoding the load
error message using the current locale's encoding.
14 changes: 10 additions & 4 deletions Python/dynload_aix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,16 @@ aix_loaderror(const char *pathname)
ERRBUF_APPEND(message[i]);
ERRBUF_APPEND("\n");
}
errbuf[strlen(errbuf)-1] = '\0'; /* trim off last newline */
pathname_ob = PyUnicode_FromString(pathname);
errbuf_ob = PyUnicode_FromString(errbuf);
PyErr_SetImportError(errbuf_ob, NULL, pathname);
/* Subtract 1 from the length to trim off trailing newline */
errbuf_ob = PyUnicode_DecodeLocaleAndSize(errbuf, strlen(errbuf)-1, "surrogateescape");
if (errbuf_ob == NULL)
return;
pathname_ob = PyUnicode_DecodeFSDefault(pathname);
if (pathname_ob == NULL) {
Py_DECREF(errbuf_ob);
return;
}
PyErr_SetImportError(errbuf_ob, NULL, pathname_ob);
Py_DECREF(pathname_ob);
Py_DECREF(errbuf_ob);
return;
Expand Down
15 changes: 13 additions & 2 deletions Python/dynload_hpux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions Python/dynload_shlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ _PyImport_FindSharedFuncptr(const char *prefix,
const char *error = dlerror();
if (error == NULL)
error = "unknown dlopen() error";
error_ob = PyUnicode_FromString(error);
error_ob = PyUnicode_DecodeLocale(error, "surrogateescape");
if (error_ob == NULL)
return NULL;
mod_name = PyUnicode_FromString(shortname);
if (mod_name == NULL) {
Py_DECREF(error_ob);
return NULL;
}
path = PyUnicode_FromString(pathname);
path = PyUnicode_DecodeFSDefault(pathname);
if (path == NULL) {
Py_DECREF(error_ob);
Py_DECREF(mod_name);
Expand Down