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

aib · Mar 19, 2019 · 943395f · 943395f
1 parent e130a07
commit 943395f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
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
@@ -0,0 +1 @@
+Fix leak in _PyRuntimeState_Fini. Contributed by Stéphane Wirtel.
diff --git 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);
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix leak in _PyRuntimeState_Fini. Contributed by Stéphane Wirtel.