Skip to content

bpo-44116: Add GC support to _csv heap types #26074

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
pablogsal merged 4 commits into from
May 12, 2021
+32 −30
Merged

bpo-44116: Add GC support to _csv heap types #26074

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01edb37
bpo-44116: Add GC support to _csv heap types
May 12, 2021
b8772d6
Revert _csv.Error changes
May 12, 2021
19e2952
Use tp_clear iso. tp_finalize
May 12, 2021
fe74fc2
Only dealloc should free memory
May 12, 2021
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
Only dealloc should free memory
  • Loading branch information
Erlend E. Aasland committed May 12, 2021
commit fe74fc2dd9ca1a59e3f12a0bb5adaf0c36834b85
14 changes: 7 additions & 7 deletions Modules/_csv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,10 @@ Reader_dealloc(ReaderObj *self)
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
tp->tp_clear((PyObject *)self);
if (self->field != NULL) {
PyMem_Free(self->field);
self->field = NULL;
}
PyObject_GC_Del(self);
Py_DECREF(tp);
}
Expand All @@ -917,10 +921,6 @@ Reader_clear(ReaderObj *self)
Py_CLEAR(self->dialect);
Py_CLEAR(self->input_iter);
Py_CLEAR(self->fields);
if (self->field != NULL) {
PyMem_Free(self->field);
self->field = NULL;
}
return 0;
}

Expand Down Expand Up @@ -1346,9 +1346,6 @@ Writer_clear(WriterObj *self)
Py_CLEAR(self->dialect);
Py_CLEAR(self->write);
Py_CLEAR(self->error_obj);
if (self->rec != NULL) {
PyMem_Free(self->rec);
}
return 0;
}

Expand All @@ -1358,6 +1355,9 @@ Writer_dealloc(WriterObj *self)
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
tp->tp_clear((PyObject *)self);
if (self->rec != NULL) {
PyMem_Free(self->rec);
}
PyObject_GC_Del(self);
Py_DECREF(tp);
}
Expand Down