bpo-40048: Fix _PyCode_InitOpcache() error path (GH-19691)

vstinner · web-flow · commit 25104949a5a6 · 2020-04-24T02:43:18.000+02:00
If _PyCode_InitOpcache() fails in _PyEval_EvalFrameDefault(), use
"goto exit_eval_frame;" rather than "return NULL;" to exit the
function in a consistent state. For example, tstate-&gt;frame is now
reset properly.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1297,7 +1297,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
         co->co_opcache_flag++;
         if (co->co_opcache_flag == OPCACHE_MIN_RUNS) {
             if (_PyCode_InitOpcache(co) < 0) {
-                return NULL;
+                goto exit_eval_frame;
             }
 #if OPCACHE_STATS
             opcache_code_objects_extra_mem +=

Original file line number	Diff line number	Diff line change
`@@ -1297,7 +1297,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, PyFrameObject f, int throwflag)`
`1297`	`1297`	`co->co_opcache_flag++;`
`1298`	`1298`	`if (co->co_opcache_flag == OPCACHE_MIN_RUNS) {`
`1299`	`1299`	`if (_PyCode_InitOpcache(co) < 0) {`
`1300`		`- return NULL;`
	`1300`	`+ goto exit_eval_frame;`
`1301`	`1301`	`}`
`1302`	`1302`	`#if OPCACHE_STATS`
`1303`	`1303`	`opcache_code_objects_extra_mem +=`