Merged revisions 78380 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78380 | thomas.heller | 2010-02-23 21:11:44 +0100 (Di, 23 Feb 2010) | 4 lines

  ctypes CThunkObject was not registered correctly with the cycle
  garbage collector, leading to possible leaks when using callback
  functions.
........

diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py
index e3e4be8a287110e83d19cb6d723506c8bc07fc5b..8f8f4b25edf2939983c7f98d56ce14c3734e92dd 100644 (file)
--- a/Lib/ctypes/test/test_callbacks.py
+++ b/Lib/ctypes/test/test_callbacks.py
@@ -118,6 +118,22 @@ class Callbacks(unittest.TestCase):
         prototype = self.functype.im_func(object)
         self.assertRaises(TypeError, prototype, lambda: None)
 
+    def test_issue_7959(self):
+        proto = self.functype.im_func(None)
+
+        class X(object):
+            def func(self): pass
+            def __init__(self):
+                self.v = proto(self.func)
+
+        import gc
+        for i in range(32):
+            X()
+        gc.collect()
+        live = [x for x in gc.get_objects()
+                if isinstance(x, X)]
+        self.failUnlessEqual(len(live), 0)
+
 try:
     WINFUNCTYPE
 except NameError:

diff --git a/Misc/NEWS b/Misc/NEWS
index 9882fad4d75250d6f226570ae2c8bd8c2826626e..8d8a66be61825451af1e0302ef263a5f228839c1 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7959: ctypes callback functions are now registered correctly
+  with the cylce garbage collector.
+
 - Issue #6243: curses.getkey() can segfault when used with ungetch.
   Fix by Trundle and Jerry Chen.
 

diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index ea43c68bc6c4f6062f57a9297e22e8c96e3578df..58c0dcacfc13da6938d72b6513d0eed9d8945b7c 100644 (file)
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -23,7 +23,7 @@ CThunkObject_dealloc(PyObject *_self)
        Py_XDECREF(self->restype);
        if (self->pcl)
                FreeClosure(self->pcl);
-       PyObject_Del(self);
+       PyObject_GC_Del(self);
 }
 
 static int
@@ -66,7 +66,7 @@ PyTypeObject CThunk_Type = {
        0,                                      /* tp_getattro */
        0,                                      /* tp_setattro */
        0,                                      /* tp_as_buffer */
-       Py_TPFLAGS_DEFAULT,                     /* tp_flags */
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,                        /* tp_flags */
        "CThunkObject",                         /* tp_doc */
        CThunkObject_traverse,                  /* tp_traverse */
        CThunkObject_clear,                     /* tp_clear */
@@ -367,7 +367,7 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
        CThunkObject *p;
        int i;
 
-       p = PyObject_NewVar(CThunkObject, &CThunk_Type, nArgs);
+       p = PyObject_GC_NewVar(CThunkObject, &CThunk_Type, nArgs);
        if (p == NULL) {
                PyErr_NoMemory();
                return NULL;
@@ -382,6 +382,7 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
        
        for (i = 0; i < nArgs + 1; ++i)
                p->atypes[i] = NULL;
+       PyObject_GC_Track((PyObject *)p);
        return p;
 }