gh-147998: Fix possible memory leak in _pop_preserved (crossinterp.c) (GH-147999)

maurycy · web-flow · commit 72f29dc70481 · 2026-05-04T16:45:31.000+03:00
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-04-02-13-25-09.gh-issue-147998.wnzkRT.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-04-02-13-25-09.gh-issue-147998.wnzkRT.rst
@@ -0,0 +1,3 @@
+Fixed a memory leak in interpreter helper calls so cleanup works when an
+operation falls across interpreter boundaries. Patch by Maurycy
+Pawłowski-Wieroński.
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
@@ -3006,7 +3006,7 @@ _pop_preserved(_PyXI_session *session,
         *p_xidata = NULL;
     }
     else {
-        _PyXI_namespace *xidata = _create_sharedns(session->_preserved);
+        xidata = _create_sharedns(session->_preserved);
         if (xidata == NULL) {
             failure.code = _PyXI_ERR_PRESERVE_FAILURE;
             goto error;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Fixed a memory leak in interpreter helper calls so cleanup works when an`
	`2`	`+operation falls across interpreter boundaries. Patch by Maurycy`
	`3`	`+Pawłowski-Wieroński.`
Original file line number	Diff line number	Diff line change
`@@ -3006,7 +3006,7 @@ _pop_preserved(_PyXI_session *session,`
`3006`	`3006`	`*p_xidata = NULL;`
`3007`	`3007`	`}`
`3008`	`3008`	`else {`
`3009`		`- _PyXI_namespace *xidata = _create_sharedns(session->_preserved);`
	`3009`	`+ xidata = _create_sharedns(session->_preserved);`
`3010`	`3010`	`if (xidata == NULL) {`
`3011`	`3011`	`failure.code = _PyXI_ERR_PRESERVE_FAILURE;`
`3012`	`3012`	`goto error;`