From: Stéphane Wirtel <stephane@wirtel.be>
Date: Tue, 19 Mar 2019 10:51:32 +0000 (+0100)
Subject: bpo-36333: Fix leak _PyRuntimeState_Fini (GH-12400)
X-Git-Tag: v3.8.0a3~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=943395fab925a11ea90d078e771cdfc4443e8c34;p=thirdparty%2FPython%2Fcpython.git

bpo-36333: Fix leak _PyRuntimeState_Fini (GH-12400)
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-03-18-10-56-53.bpo-36333.4dqemZ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-03-18-10-56-53.bpo-36333.4dqemZ.rst
new file mode 100644
index 000000000000..e5af44fda409
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-03-18-10-56-53.bpo-36333.4dqemZ.rst	
@@ -0,0 +1 @@
+Fix leak in _PyRuntimeState_Fini. Contributed by Stéphane Wirtel.
diff --git a/Python/pystate.c b/Python/pystate.c
index 6a2dc102ecfe..36566b767155 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -92,6 +92,11 @@ _PyRuntimeState_Fini(_PyRuntimeState *runtime)
         runtime->interpreters.mutex = NULL;
     }
 
+    if (runtime->xidregistry.mutex != NULL) {
+        PyThread_free_lock(runtime->xidregistry.mutex);
+        runtime->xidregistry.mutex = NULL;
+    }
+
     PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
 }