[3.15] gh-151177: Fix race condition in _testembed (GH-151293) (GH-151312)

miss-islington · ZeroIntensity · web-flow · commit 491768da4c7f · 2026-06-11T06:10:55.000-04:00
gh-151177: Fix race condition in `_testembed` (GH-151293) (cherry picked from commit f9ffca3) Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
@@ -2710,8 +2710,8 @@ do_tstate_ensure(void *arg)
     PyThreadState_Release(tokens[2]);
     PyThreadState_Release(tokens[1]);
     PyThreadState_Release(tokens[0]);
-    PyInterpreterGuard_Close(guard);
     _Py_atomic_store_int(&data->done, 1);
+    PyInterpreterGuard_Close(guard);
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -2710,8 +2710,8 @@ do_tstate_ensure(void *arg)`
`2710`	`2710`	`PyThreadState_Release(tokens[2]);`
`2711`	`2711`	`PyThreadState_Release(tokens[1]);`
`2712`	`2712`	`PyThreadState_Release(tokens[0]);`
`2713`		`- PyInterpreterGuard_Close(guard);`
`2714`	`2713`	`_Py_atomic_store_int(&data->done, 1);`
	`2714`	`+ PyInterpreterGuard_Close(guard);`
`2715`	`2715`	`}`
`2716`	`2716`
`2717`	`2717`	`static int`