Merge 3.2: Issue #12483: ctypes: Fix a crash when the destruction of a callback

amauryfa · amauryfa · commit 65604b51e0da · 2011-09-12T21:09:12.000+02:00
object triggers the garbage collector.
diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py
@@ -134,6 +134,14 @@ def __init__(self):
                 if isinstance(x, X)]
         self.assertEqual(len(live), 0)
 
+    def test_issue12483(self):
+        import gc
+        class Nasty:
+            def __del__(self):
+                gc.collect()
+        CFUNCTYPE(None)(lambda x=Nasty(): None)
+        
+
 try:
     WINFUNCTYPE
 except NameError:
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -1274,6 +1274,9 @@ Tools/Demos
 Extension Modules
 -----------------
 
+- Issue #12483: ctypes: Fix a crash when the destruction of a callback
+  object triggers the garbage collector.
+
 - Issue #12950: Fix passing file descriptors in multiprocessing, under
   OpenIndiana/Illumos.
 
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
@@ -13,6 +13,7 @@ static void
 CThunkObject_dealloc(PyObject *_self)
 {
     CThunkObject *self = (CThunkObject *)_self;
+    PyObject_GC_UnTrack(self);
     Py_XDECREF(self->converters);
     Py_XDECREF(self->callable);
     Py_XDECREF(self->restype);

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ static void`
`13`	`13`	`CThunkObject_dealloc(PyObject *_self)`
`14`	`14`	`{`
`15`	`15`	`CThunkObject self = (CThunkObject )_self;`
	`16`	`+ PyObject_GC_UnTrack(self);`
`16`	`17`	`Py_XDECREF(self->converters);`
`17`	`18`	`Py_XDECREF(self->callable);`
`18`	`19`	`Py_XDECREF(self->restype);`