diff options
| author | Erlend Egeberg Aasland <erlend.aasland@innova.no> | 2021-05-27 07:29:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 07:29:00 (GMT) |
| commit | 59af59c2dfa52dcd5605185263f266a49ced934c (patch) | |
| tree | 4e9f198bac64f511f2348421aaa8f2dc41a6cdc9 /Modules/_dbmmodule.c | |
| parent | fbff5387c3e1f3904420fa5a27738c6c5881305b (diff) | |
| download | cpython-59af59c2dfa52dcd5605185263f266a49ced934c.zip cpython-59af59c2dfa52dcd5605185263f266a49ced934c.tar.gz cpython-59af59c2dfa52dcd5605185263f266a49ced934c.tar.bz2 | |
bpo-42972: Fully support GC for pyexpat, unicodedata, and dbm/gdbm heap types (GH-26376)
* bpo-42972: pyexpat
* bpo-42972: unicodedata
* bpo-42972: dbm/gdbm
Diffstat (limited to 'Modules/_dbmmodule.c')
| -rw-r--r-- | Modules/_dbmmodule.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c index 96d0b0a..2b4d071 100644 --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -65,13 +65,14 @@ typedef struct { static PyObject * newdbmobject(_dbm_state *state, const char *file, int flags, int mode) { - dbmobject *dp; - - dp = PyObject_New(dbmobject, state->dbm_type); - if (dp == NULL) + dbmobject *dp = PyObject_GC_New(dbmobject, state->dbm_type); + if (dp == NULL) { return NULL; + } dp->di_size = -1; dp->flags = flags; + PyObject_GC_Track(dp); + /* See issue #19296 */ if ( (dp->di_dbm = dbm_open((char *)file, flags, mode)) == 0 ) { PyErr_SetFromErrnoWithFilename(state->dbm_error, file); @@ -82,10 +83,17 @@ newdbmobject(_dbm_state *state, const char *file, int flags, int mode) } /* Methods */ +static int +dbm_traverse(dbmobject *dp, visitproc visit, void *arg) +{ + Py_VISIT(Py_TYPE(dp)); + return 0; +} static void dbm_dealloc(dbmobject *dp) { + PyObject_GC_UnTrack(dp); if (dp->di_dbm) { dbm_close(dp->di_dbm); } @@ -397,6 +405,7 @@ static PyMethodDef dbm_methods[] = { static PyType_Slot dbmtype_spec_slots[] = { {Py_tp_dealloc, dbm_dealloc}, + {Py_tp_traverse, dbm_traverse}, {Py_tp_methods, dbm_methods}, {Py_sq_contains, dbm_contains}, {Py_mp_length, dbm_length}, @@ -413,7 +422,8 @@ static PyType_Spec dbmtype_spec = { // dbmtype_spec does not have Py_TPFLAGS_BASETYPE flag // which prevents to create a subclass. // So calling PyType_GetModuleState() in this file is always safe. - .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION, + .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION | + Py_TPFLAGS_HAVE_GC), .slots = dbmtype_spec_slots, }; |