Fix crash in getlocals

JelleZijlstra · May 7, 2024 · c5bee13 · c5bee13
1 parent b9caa09
commit c5bee13
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
@@ -742,6 +742,15 @@ frame_getlocals(PyFrameObject *f, void *closure)
     PyCodeObject *co = _PyFrame_GetCode(f->f_frame);
 
     if (!(co->co_flags & CO_OPTIMIZED) && !_PyFrame_HasHiddenLocals(f->f_frame)) {
+        if (f->f_frame->f_locals == NULL) {
+            // We found cases when f_locals is NULL for non-optimized code.
+            // We fill the f_locals with an empty dict to avoid crash until
+            // we find the root cause.
+            f->f_frame->f_locals = PyDict_New();
+            if (f->f_frame->f_locals == NULL) {
+                return NULL;
+            }
+        }
         return Py_NewRef(f->f_frame->f_locals);
     }