Initialize sub-stack slot on non-debug builds as well

markshannon · markshannon · commit 492df4e46015 · 2025-04-04T12:59:49.000+01:00
diff --git a/Include/internal/pycore_interpframe.h b/Include/internal/pycore_interpframe.h
@@ -146,11 +146,10 @@ _PyFrame_Initialize(
     frame->owner = FRAME_OWNED_BY_THREAD;
     frame->visited = 0;
 #ifdef Py_DEBUG
-    frame->localsplus[code->co_nlocalsplus] = PyStackRef_NULL;
     frame->lltrace = 0;
 #endif
 
-    for (int i = null_locals_from; i < code->co_nlocalsplus; i++) {
+    for (int i = null_locals_from; i <= code->co_nlocalsplus; i++) {
         frame->localsplus[i] = PyStackRef_NULL;
     }
 }
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -990,9 +990,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
      * These are cached values from the frame and code object.  */
     _Py_CODEUNIT *next_instr;
     _PyStackRef *stack_pointer;
-#ifdef Py_DEBUG
     entry_frame.localsplus[0] = PyStackRef_NULL;
-#endif
 #ifdef Py_STACKREF_DEBUG
     entry_frame.f_funcobj = PyStackRef_None;
 #elif defined(Py_DEBUG)

Original file line number	Diff line number	Diff line change
`@@ -146,11 +146,10 @@ _PyFrame_Initialize(`
`146`	`146`	`frame->owner = FRAME_OWNED_BY_THREAD;`
`147`	`147`	`frame->visited = 0;`
`148`	`148`	`#ifdef Py_DEBUG`
`149`		`- frame->localsplus[code->co_nlocalsplus] = PyStackRef_NULL;`
`150`	`149`	`frame->lltrace = 0;`
`151`	`150`	`#endif`
`152`	`151`
`153`		`- for (int i = null_locals_from; i < code->co_nlocalsplus; i++) {`
	`152`	`+ for (int i = null_locals_from; i <= code->co_nlocalsplus; i++) {`
`154`	`153`	`frame->localsplus[i] = PyStackRef_NULL;`
`155`	`154`	`}`
`156`	`155`	`}`