SF patch 522961: Leak in Python/thread_nt.h, from Gerald S. Williams.
A file-static "threads" dict mapped thread IDs to Windows handles, but
was never referenced, and entries never got removed. This gets rid of
the YAGNI-dict entirely.
Bugfix candidate.
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
index 0192707..44814c6 100644
--- a/Python/thread_nt.h
+++ b/Python/thread_nt.h
@@ -1,11 +1,11 @@
/* This code implemented by Dag.Gruneau@elsa.preseco.comm.se */
/* Fast NonRecursiveMutex support by Yakov Markovitch, markovitch@iso.ru */
+/* Eliminated some memory leaks, gsw@agere.com */
#include <windows.h>
#include <limits.h>
#include <process.h>
-#include <Python.h>
typedef struct NRMUTEX {
LONG owned ;
@@ -13,9 +13,6 @@
HANDLE hevent ;
} NRMUTEX, *PNRMUTEX ;
-/* dictionary to correlate thread ids with the handle needed to terminate them*/
-static PyObject *threads = NULL;
-
typedef PVOID WINAPI interlocked_cmp_xchg_t(PVOID *dest, PVOID exc, PVOID comperand) ;
/* Sorry mate, but we haven't got InterlockedCompareExchange in Win95! */
@@ -139,16 +136,10 @@
long PyThread_get_thread_ident(void);
/*
- * Change all headers to pure ANSI as no one will use K&R style on an
- * NT
- */
-
-/*
* Initialization of the C package, should not be needed.
*/
static void PyThread__init_thread(void)
{
- threads = PyDict_New();
}
/*
@@ -182,7 +173,6 @@
int success = 0;
callobj *obj;
int id;
- PyObject *key, *val;
dprintf(("%ld: PyThread_start_new_thread called\n", PyThread_get_thread_ident()));
if (!initialized)
@@ -203,9 +193,6 @@
/* wait for thread to initialize and retrieve id */
WaitForSingleObject(obj->done, 5000); /* maybe INFINITE instead of 5000? */
CloseHandle((HANDLE)obj->done);
- key = PyLong_FromLong(obj->id);
- val = PyLong_FromLong((long)rv);
- PyDict_SetItem(threads, key, val);
id = obj->id;
free(obj);
return id;