Account for frames with null globals in Lazy Imports 3.12

Alex Malyshev · facebook-github-bot · commit f922381a8667 · 2025-03-17T18:19:34.000-07:00
Summary: Seeing this happening in the wild.

Reviewed By: DinoV

Differential Revision: D71346596

fbshipit-source-id: c6e2243a9e934032aeb3f85c36d371495b671a39
diff --git a/Python/import.c b/Python/import.c
@@ -4607,7 +4607,7 @@ is_lazy_imports_active(PyThreadState *tstate, _PyInterpreterFrame *frame)
         return 1;
     }
 
-    if (!PyDict_CheckExact(frame->f_globals)) {
+    if (frame->f_globals == NULL || !PyDict_CheckExact(frame->f_globals)) {
         return 0;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4607,7 +4607,7 @@ is_lazy_imports_active(PyThreadState tstate, _PyInterpreterFrame frame)`
`4607`	`4607`	`return 1;`
`4608`	`4608`	`}`
`4609`	`4609`
`4610`		`- if (!PyDict_CheckExact(frame->f_globals)) {`
	`4610`	`+ if (frame->f_globals == NULL \|\| !PyDict_CheckExact(frame->f_globals)) {`
`4611`	`4611`	`return 0;`
`4612`	`4612`	`}`
`4613`	`4613`