Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions Lib/test/test_lazy_import/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1949,6 +1949,17 @@ def filter(*args):
def test_set_bad_filter(self):
self.assertRaises(ValueError, _testcapi.PyImport_SetLazyImportsFilter, 42)

def test_dunder_lazy_import_without_frame(self):
# gh-151510: __lazy_import__() called with no globals and no running
# Python frame must raise TypeError instead of crashing.
with self.assertRaisesRegex(
TypeError,
r"__lazy_import__\(\) missing globals when called without a frame",
):
_testcapi.lazy_import_without_frame(
"test.test_lazy_import.data.basic2"
)


if __name__ == '__main__':
unittest.main()
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash in :func:`!__lazy_import__` when called without an explicit
``globals`` argument and without a current Python frame.
22 changes: 22 additions & 0 deletions Modules/_testcapi/import.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
#include "parts.h"
#include "util.h"

static PyObject *
pyimport_lazyimportwithoutframe(PyObject *self, PyObject *name)
{
PyObject *lazy_import = PyImport_ImportModuleAttrString("builtins",
"__lazy_import__");
if (lazy_import == NULL) {
return NULL;
}

// Simulate being called with no running Python frame (e.g. from a freshly
// attached C thread), so that PyEval_GetGlobals() returns NULL.
PyThreadState *tstate = PyThreadState_Get();
struct _PyInterpreterFrame *saved = tstate->current_frame;
tstate->current_frame = NULL;
PyObject *res = PyObject_CallOneArg(lazy_import, name);
tstate->current_frame = saved;

Py_DECREF(lazy_import);
return res;
}

// Test PyImport_ImportModuleAttr()
static PyObject *
pyimport_importmoduleattr(PyObject *self, PyObject *args)
Expand Down Expand Up @@ -95,6 +116,7 @@ static PyMethodDef test_methods[] = {
{"PyImport_GetLazyImportsMode", pyimport_getlazyimportsmode, METH_NOARGS},
{"PyImport_SetLazyImportsFilter", pyimport_setlazyimportsfilter, METH_VARARGS},
{"PyImport_GetLazyImportsFilter", pyimport_getlazyimportsfilter, METH_NOARGS},
{"lazy_import_without_frame", pyimport_lazyimportwithoutframe, METH_O},
{NULL},
};

Expand Down
6 changes: 6 additions & 0 deletions Python/bltinmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,12 @@ builtin___lazy_import___impl(PyObject *module, PyObject *name,
PyThreadState *tstate = PyThreadState_GET();
if (globals == NULL) {
globals = PyEval_GetGlobals();
if (globals == NULL) {
PyErr_SetString(PyExc_TypeError,
"__lazy_import__() missing globals "
"when called without a frame");
return NULL;
}
}
if (locals == NULL) {
locals = globals;
Expand Down
Loading