commit ff359d735f1a60878975d1c5751bfd2361e84067
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon May 31 02:12:27 2021 -0700
committer GitHub <noreply@github.com> Mon May 31 11:12:27 2021 +0200
tree f27c50e4432a9ee27ab1686298163301ce9b5149
parent d338ce0796e5fe8e54dfe52f93ed9d5936ad3efe

bpo-42972: Fix sqlite3 traverse/clear functions (GH-26452) (GH-26461)

(cherry picked from commit d1124b09e8251061dc040cbd396f35ae57783f4a)

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

Modules/_sqlite/cache.c

diff --git a/Modules/_sqlite/cache.c b/Modules/_sqlite/cache.c
index e0a1707..fd4e619 100644
--- a/Modules/_sqlite/cache.c
+++ b/Modules/_sqlite/cache.c
@@ -47,9 +47,9 @@ pysqlite_new_node(PyObject *key, PyObject *data)
 static int
 node_traverse(pysqlite_Node *self, visitproc visit, void *arg)
 {
+    Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->key);
     Py_VISIT(self->data);
-    Py_VISIT(Py_TYPE(self));
     return 0;
 }
 
@@ -106,22 +106,28 @@ pysqlite_cache_init(pysqlite_Cache *self, PyObject *args, PyObject *kwargs)
 static int
 cache_traverse(pysqlite_Cache *self, visitproc visit, void *arg)
 {
+    Py_VISIT(Py_TYPE(self));
+    Py_VISIT(self->mapping);
+    if (self->decref_factory) {
+        Py_VISIT(self->factory);
+    }
+
     pysqlite_Node *node = self->first;
     while (node) {
         Py_VISIT(node);
         node = node->next;
     }
-    Py_VISIT(self->mapping);
-    if (self->decref_factory) {
-        Py_VISIT(self->factory);
-    }
-    Py_VISIT(Py_TYPE(self));
     return 0;
 }
 
 static int
 cache_clear(pysqlite_Cache *self)
 {
+    Py_CLEAR(self->mapping);
+    if (self->decref_factory) {
+        Py_CLEAR(self->factory);
+    }
+
     /* iterate over all nodes and deallocate them */
     pysqlite_Node *node = self->first;
     self->first = NULL;
@@ -130,10 +136,6 @@ cache_clear(pysqlite_Cache *self)
         node = node->next;
         Py_CLEAR(delete_node);
     }
-    if (self->decref_factory) {
-        Py_CLEAR(self->factory);
-    }
-    Py_CLEAR(self->mapping);
     return 0;
 }