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

matrixise · vstinner · commit 943395fab925 · 2019-03-19T11:51:32.000+01:00
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 @@`
	`1`	`+Fix leak in _PyRuntimeState_Fini. Contributed by Stéphane Wirtel.`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,11 @@ _PyRuntimeState_Fini(_PyRuntimeState *runtime)`
`92`	`92`	`runtime->interpreters.mutex = NULL;`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ if (runtime->xidregistry.mutex != NULL) {`
	`96`	`+ PyThread_free_lock(runtime->xidregistry.mutex);`
	`97`	`+ runtime->xidregistry.mutex = NULL;`
	`98`	`+ }`
	`99`	`+`
`95`	`100`	`PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);`
`96`	`101`	`}`
`97`	`102`