diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2011-09-12 18:12:09 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2011-09-12 18:12:09 (GMT) |
| commit | 439c25eb9e53fb5b47dd392cccd3a8183e0910eb (patch) | |
| tree | 4222f7db271ed1146d3e119a617c8ed4179d89ab | |
| parent | dcdc3ef5facabec526dff5f78dc3c0b9161184cb (diff) | |
| download | cpython-439c25eb9e53fb5b47dd392cccd3a8183e0910eb.zip cpython-439c25eb9e53fb5b47dd392cccd3a8183e0910eb.tar.gz cpython-439c25eb9e53fb5b47dd392cccd3a8183e0910eb.tar.bz2 | |
Issue #12483: ctypes: Fix a crash when the destruction of a callback
object triggers the garbage collector.
| -rw-r--r-- | Lib/ctypes/test/test_callbacks.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_ctypes/callbacks.c | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py index 621a019..901456d 100644 --- a/Lib/ctypes/test/test_callbacks.py +++ b/Lib/ctypes/test/test_callbacks.py @@ -140,6 +140,14 @@ class Callbacks(unittest.TestCase): 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: @@ -192,6 +192,9 @@ Library 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 index 2b54a85..47dbe05 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -18,6 +18,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); |