commit 4431922f92747f77e3eb790c6d1881232e1b5e8c
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Thu May 27 01:10:39 2021 -0700
committer GitHub <noreply@github.com> Thu May 27 01:10:39 2021 -0700
tree b5905f94dfe1716f0e2a31aacf9002883eb872c9
parent 5d569ef9dd57cf03473ef0c04f0e58b6c5cb5d04

[3.10] bpo-42972: Fully support GC for hashlib heap types (GH-26374) (GH-26398)



(cherry picked from commit 6ef5ba391d700bde7ec3ffd5fb7132a30dd309c4)


Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>

Automerge-Triggered-By: GH:tiran

Modules/md5module.c

diff --git a/Modules/md5module.c b/Modules/md5module.c
index 9067c27..b50d2e5 100644
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -333,16 +333,25 @@ md5_get_state(PyObject *module)
 static MD5object *
 newMD5object(MD5State * st)
 {
-    return (MD5object *)PyObject_New(MD5object, st->md5_type);
+    MD5object *md5 = (MD5object *)PyObject_GC_New(MD5object, st->md5_type);
+    PyObject_GC_Track(md5);
+    return md5;
 }
 
 /* Internal methods for a hash object */
+static int
+MD5_traverse(PyObject *ptr, visitproc visit, void *arg)
+{
+    Py_VISIT(Py_TYPE(ptr));
+    return 0;
+}
 
 static void
 MD5_dealloc(PyObject *ptr)
 {
     PyTypeObject *tp = Py_TYPE(ptr);
-    PyObject_Free(ptr);
+    PyObject_GC_UnTrack(ptr);
+    PyObject_GC_Del(ptr);
     Py_DECREF(tp);
 }
 
@@ -478,13 +487,15 @@ static PyType_Slot md5_type_slots[] = {
     {Py_tp_dealloc, MD5_dealloc},
     {Py_tp_methods, MD5_methods},
     {Py_tp_getset, MD5_getseters},
+    {Py_tp_traverse, MD5_traverse},
     {0,0}
 };
 
 static PyType_Spec md5_type_spec = {
     .name = "_md5.md5",
     .basicsize =  sizeof(MD5object),
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION | Py_TPFLAGS_IMMUTABLETYPE,
+    .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION |
+              Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC),
     .slots = md5_type_slots
 };