Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-109521: Fix obscure cases handling in PyImport_GetImporter() (GH-109522)

Browse source 
PyImport_GetImporter() now sets RuntimeError if it fails to get sys.path_hooks
or sys.path_importer_cache or they are not list and dict correspondingly.

Previously it could return NULL without setting error in obscure cases,
crash or raise SystemError if these attributes have wrong type.
This commit is contained in:
Serhiy Storchaka 2023-09-23 09:39:24 +03:00 • committed by GitHub
parent b8d1744e7b
commit 62c7015e89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Misc/NEWS.d/next/C API/2023-09-17-21-47-31.gh-issue-109521.JDF6i9.rst Normal file
View file

@ -0,0 +1,5 @@
:c:func:`PyImport_GetImporter` now sets RuntimeError if it fails to get
:data:`sys.path_hooks` or :data:`sys.path_importer_cache` or they are not
list and dict correspondingly. Previously it could return NULL without
setting error in obscure cases, crash or raise SystemError if these
attributes have wrong type.

28
Python/import.c
View file

@ -2363,9 +2363,14 @@ get_path_importer(PyThreadState *tstate, PyObject *path_importer_cache,
PyObject *importer; PyObject *importer;
Py_ssize_t j, nhooks; Py_ssize_t j, nhooks;
/* These conditions are the caller's responsibility: */ if (!PyList_Check(path_hooks)) {
assert(PyList_Check(path_hooks)); PyErr_SetString(PyExc_RuntimeError, "sys.path_hooks is not a list");
assert(PyDict_Check(path_importer_cache)); return NULL;
}
if (!PyDict_Check(path_importer_cache)) {
PyErr_SetString(PyExc_RuntimeError, "sys.path_importer_cache is not a dict");
return NULL;
}
nhooks = PyList_Size(path_hooks); nhooks = PyList_Size(path_hooks);
if (nhooks < 0) if (nhooks < 0)
@ -2408,11 +2413,22 @@ PyImport_GetImporter(PyObject *path)
{ {
PyThreadState *tstate = _PyThreadState_GET(); PyThreadState *tstate = _PyThreadState_GET();
PyObject *path_importer_cache = PySys_GetObject("path_importer_cache"); PyObject *path_importer_cache = PySys_GetObject("path_importer_cache");
PyObject *path_hooks = PySys_GetObject("path_hooks"); if (path_importer_cache == NULL) {
if (path_importer_cache == NULL || path_hooks == NULL) { PyErr_SetString(PyExc_RuntimeError, "lost sys.path_importer_cache");
return NULL; return NULL;
} }
return get_path_importer(tstate, path_importer_cache, path_hooks, path); Py_INCREF(path_importer_cache);
PyObject *path_hooks = PySys_GetObject("path_hooks");
if (path_hooks == NULL) {
PyErr_SetString(PyExc_RuntimeError, "lost sys.path_hooks");
Py_DECREF(path_importer_cache);
return NULL;
}
Py_INCREF(path_hooks);
PyObject *importer = get_path_importer(tstate, path_importer_cache, path_hooks, path);
Py_DECREF(path_hooks);
Py_DECREF(path_importer_cache);
return importer;
} }