[Python-checkins] gh-104456: Fix ref leak in _ctypes.COMError (#104457)

erlend-aasland webhook-mailer at python.org
Sun May 14 17:05:42 EDT 2023


https://github.com/python/cpython/commit/2cd1c87d2a23ffd00730b5d1648304593530326c
commit: 2cd1c87d2a23ffd00730b5d1648304593530326c
branch: main
author: Kirill Podoprigora <kirill.bast9 at mail.ru>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2023-05-14T21:05:35Z
summary:

gh-104456: Fix ref leak in _ctypes.COMError (#104457)

files:
M Modules/_ctypes/_ctypes.c

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index f6cda45eaeac..534ef8c1d6cf 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -5476,11 +5476,17 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds)
     return 0;
 }
 
+static int
+comerror_clear(PyObject *self)
+{
+    return ((PyTypeObject *)PyExc_BaseException)->tp_clear(self);
+}
+
 static int
 comerror_traverse(PyObject *self, visitproc visit, void *arg)
 {
     Py_VISIT(Py_TYPE(self));
-    return 0;
+    return ((PyTypeObject *)PyExc_BaseException)->tp_traverse(self, visit, arg);
 }
 
 static void
@@ -5488,6 +5494,7 @@ comerror_dealloc(PyObject *self)
 {
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_UnTrack(self);
+    (void)comerror_clear(self);
     tp->tp_free(self);
     Py_DECREF(tp);
 }
@@ -5497,6 +5504,7 @@ static PyType_Slot comerror_slots[] = {
     {Py_tp_init, comerror_init},
     {Py_tp_traverse, comerror_traverse},
     {Py_tp_dealloc, comerror_dealloc},
+    {Py_tp_clear, comerror_clear},
     {0, NULL},
 };
 



More information about the Python-checkins mailing list