Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 5 commits into from
May 14, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dbad09
gh-104456: Fix ref leak in test_ctypes
Eclips4 May 13, 2023
28ac7ed
Add suggestion
Eclips4 May 13, 2023
91e8893
Update Modules/_ctypes/_ctypes.c
Eclips4 May 13, 2023
e317450
add suggestions from sunmy2019
Eclips4 May 14, 2023
019234e
Update Modules/_ctypes/_ctypes.c
erlend-aasland May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add suggestion
  • Loading branch information
@Eclips4
Eclips4 committed May 13, 2023
commit 28ac7ed44275d48fad021e55ff10d44906de4531
26 changes: 17 additions & 9 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5476,26 +5476,33 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds)
return 0;
}

static int
comerror_clear(PyObject *self) {
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
PyBaseExceptionObject *obj = (PyBaseExceptionObject *) self;
Py_CLEAR(obj->dict);
Py_CLEAR(obj->args);
Py_CLEAR(obj->notes);
Py_CLEAR(obj->traceback);
Py_CLEAR(obj->cause);
Py_CLEAR(obj->context);
return 0;
Comment thread
sunmy2019 marked this conversation as resolved.
Outdated
}

static int
comerror_traverse(PyObject *self, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(self));
PyTypeObject *tp = Py_TYPE(self);
Py_VISIT(tp);
tp->tp_clear(self);
Comment thread
sunmy2019 marked this conversation as resolved.
Outdated
return 0;
}

static void
comerror_dealloc(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyBaseExceptionObject *obj = (PyBaseExceptionObject *) self;

Py_CLEAR(obj->dict);
Py_CLEAR(obj->args);
Py_CLEAR(obj->notes);
Py_CLEAR(obj->traceback);
Py_CLEAR(obj->cause);
Py_CLEAR(obj->context);
PyObject_GC_UnTrack(self);
tp->tp_clear(self);
Comment thread
Eclips4 marked this conversation as resolved.
Outdated
tp->tp_free(self);
Py_DECREF(tp);
}
Expand All @@ -5505,6 +5512,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},
};

Expand Down