https://github.com/python/cpython/commit/e7aec8713f84e90b20c9baae6b7a91d87f327ff0
commit: e7aec8713f84e90b20c9baae6b7a91d87f327ff0
branch: main
author: Tian Gao <[email protected]>
committer: gvanrossum <[email protected]>
date: 2024-05-07T17:48:05-07:00
summary:
gh-118746: Fix crash in frame_getlocals and _PyFrame_GetLocals (#118748)
We don't know how to create an unoptimized frame with f_locals == NULL,
but they are seen in the wild, and this fixes the crash.
files:
M Objects/frameobject.c
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 26a04cbeea90bf..d7fcb1925d286c 100644
--- 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);
}
@@ -1937,6 +1946,15 @@ _PyFrame_GetLocals(_PyInterpreterFrame *frame)
PyCodeObject *co = _PyFrame_GetCode(frame);
if (!(co->co_flags & CO_OPTIMIZED) && !_PyFrame_HasHiddenLocals(frame)) {
+ if (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.
+ frame->f_locals = PyDict_New();
+ if (frame->f_locals == NULL) {
+ return NULL;
+ }
+ }
return Py_NewRef(frame->f_locals);
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
