From 3ff8de4cd530d00a13284c19e0f7d3f28a566d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:42:42 +0100
Subject: [PATCH 1/8] fix UBSan failures for `pysqlite_Blob`

---
 Modules/_sqlite/blob.c | 22 ++++++++++++++--------
 Modules/_sqlite/blob.h |  2 ++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Modules/_sqlite/blob.c b/Modules/_sqlite/blob.c
index d1a549a971c24a..e4a2439e9eed86 100644
--- a/Modules/_sqlite/blob.c
+++ b/Modules/_sqlite/blob.c
@@ -29,32 +29,35 @@ close_blob(pysqlite_Blob *self)
 }
 
 static int
-blob_traverse(pysqlite_Blob *self, visitproc visit, void *arg)
+blob_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    pysqlite_Blob *self = _pysqlite_Blob_CAST(op);
     Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->connection);
     return 0;
 }
 
 static int
-blob_clear(pysqlite_Blob *self)
+blob_clear(PyObject *op)
 {
+    pysqlite_Blob *self = _pysqlite_Blob_CAST(op);
     Py_CLEAR(self->connection);
     return 0;
 }
 
 static void
-blob_dealloc(pysqlite_Blob *self)
+blob_dealloc(PyObject *op)
 {
+    pysqlite_Blob *self = _pysqlite_Blob_CAST(op);
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_UnTrack(self);
 
     close_blob(self);
 
     if (self->in_weakreflist != NULL) {
-        PyObject_ClearWeakRefs((PyObject*)self);
+        PyObject_ClearWeakRefs(op);
     }
-    tp->tp_clear((PyObject *)self);
+    (void)tp->tp_clear(op);
     tp->tp_free(self);
     Py_DECREF(tp);
 }
@@ -373,8 +376,9 @@ blob_exit_impl(pysqlite_Blob *self, PyObject *type, PyObject *val,
 }
 
 static Py_ssize_t
-blob_length(pysqlite_Blob *self)
+blob_length(PyObject *op)
 {
+    pysqlite_Blob *self = _pysqlite_Blob_CAST(op);
     if (!check_blob(self)) {
         return -1;
     }
@@ -449,8 +453,9 @@ subscript_slice(pysqlite_Blob *self, PyObject *item)
 }
 
 static PyObject *
-blob_subscript(pysqlite_Blob *self, PyObject *item)
+blob_subscript(PyObject *op, PyObject *item)
 {
+    pysqlite_Blob *self = _pysqlite_Blob_CAST(op);
     if (!check_blob(self)) {
         return NULL;
     }
@@ -546,8 +551,9 @@ ass_subscript_slice(pysqlite_Blob *self, PyObject *item, PyObject *value)
 }
 
 static int
-blob_ass_subscript(pysqlite_Blob *self, PyObject *item, PyObject *value)
+blob_ass_subscript(PyObject *op, PyObject *item, PyObject *value)
 {
+    pysqlite_Blob *self = _pysqlite_Blob_CAST(op);
     if (!check_blob(self)) {
         return -1;
     }
diff --git a/Modules/_sqlite/blob.h b/Modules/_sqlite/blob.h
index 418ca03bdb51d1..d985c7788b52ce 100644
--- a/Modules/_sqlite/blob.h
+++ b/Modules/_sqlite/blob.h
@@ -18,6 +18,8 @@ typedef struct {
     PyObject *in_weakreflist;
 } pysqlite_Blob;
 
+#define _pysqlite_Blob_CAST(op) ((pysqlite_Blob *)(op))
+
 int pysqlite_blob_setup_types(PyObject *mod);
 void pysqlite_close_all_blobs(pysqlite_Connection *self);
 

From bc51984738a6ded2b5d8dccaf3cd5b743cc8724d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:50:09 +0100
Subject: [PATCH 2/8] fix UBSan failures for `pysqlite_Connection`

---
 Modules/_sqlite/connection.c | 48 +++++++++++++++++++++++-------------
 Modules/_sqlite/connection.h |  2 ++
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index fc03e4a085c179..3dacafd0d1ec5f 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -385,8 +385,9 @@ do {                                \
 } while (0)
 
 static int
-connection_traverse(pysqlite_Connection *self, visitproc visit, void *arg)
+connection_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->statement_cache);
     Py_VISIT(self->cursors);
@@ -410,8 +411,9 @@ clear_callback_context(callback_context *ctx)
 }
 
 static int
-connection_clear(pysqlite_Connection *self)
+connection_clear(PyObject *op)
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     Py_CLEAR(self->statement_cache);
     Py_CLEAR(self->cursors);
     Py_CLEAR(self->blobs);
@@ -518,7 +520,7 @@ connection_dealloc(PyObject *self)
     }
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_UnTrack(self);
-    tp->tp_clear(self);
+    (void)tp->tp_clear(self);
     tp->tp_free(self);
     Py_DECREF(tp);
 }
@@ -1711,8 +1713,10 @@ int pysqlite_check_thread(pysqlite_Connection* self)
     return 1;
 }
 
-static PyObject* pysqlite_connection_get_isolation_level(pysqlite_Connection* self, void* unused)
+static PyObject *
+pysqlite_connection_get_isolation_level(PyObject *op, void *Py_UNUSED(closure))
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     if (!pysqlite_check_connection(self)) {
         return NULL;
     }
@@ -1722,16 +1726,20 @@ static PyObject* pysqlite_connection_get_isolation_level(pysqlite_Connection* se
     Py_RETURN_NONE;
 }
 
-static PyObject* pysqlite_connection_get_total_changes(pysqlite_Connection* self, void* unused)
+static PyObject *
+pysqlite_connection_get_total_changes(PyObject *op, void *Py_UNUSED(closure))
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     if (!pysqlite_check_connection(self)) {
         return NULL;
     }
     return PyLong_FromLong(sqlite3_total_changes(self->db));
 }
 
-static PyObject* pysqlite_connection_get_in_transaction(pysqlite_Connection* self, void* unused)
+static PyObject *
+pysqlite_connection_get_in_transaction(PyObject *op, void *Py_UNUSED(closure))
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     if (!pysqlite_check_connection(self)) {
         return NULL;
     }
@@ -1742,8 +1750,11 @@ static PyObject* pysqlite_connection_get_in_transaction(pysqlite_Connection* sel
 }
 
 static int
-pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level, void *Py_UNUSED(ignored))
+pysqlite_connection_set_isolation_level(PyObject *op,
+                                        PyObject *isolation_level,
+                                        void *Py_UNUSED(ignored))
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     if (isolation_level == NULL) {
         PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
         return -1;
@@ -1766,11 +1777,11 @@ pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* iso
 }
 
 static PyObject *
-pysqlite_connection_call(pysqlite_Connection *self, PyObject *args,
-                         PyObject *kwargs)
+pysqlite_connection_call(PyObject *op, PyObject *args, PyObject *kwargs)
 {
     PyObject* sql;
     pysqlite_Statement* statement;
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
 
     if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
         return NULL;
@@ -2521,8 +2532,9 @@ getconfig_impl(pysqlite_Connection *self, int op)
 }
 
 static PyObject *
-get_autocommit(pysqlite_Connection *self, void *Py_UNUSED(ctx))
+get_autocommit(PyObject *op, void *Py_UNUSED(closure))
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
         return NULL;
     }
@@ -2536,8 +2548,9 @@ get_autocommit(pysqlite_Connection *self, void *Py_UNUSED(ctx))
 }
 
 static int
-set_autocommit(pysqlite_Connection *self, PyObject *val, void *Py_UNUSED(ctx))
+set_autocommit(PyObject *op, PyObject *val, void *Py_UNUSED(closure))
 {
+    pysqlite_Connection *self = _pysqlite_Connection_CAST(op);
     if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
         return -1;
     }
@@ -2562,7 +2575,7 @@ set_autocommit(pysqlite_Connection *self, PyObject *val, void *Py_UNUSED(ctx))
 }
 
 static PyObject *
-get_sig(PyObject *self, void *Py_UNUSED(ctx))
+get_sig(PyObject *Py_UNUSED(self), void *Py_UNUSED(closure))
 {
     return PyUnicode_FromString("(sql, /)");
 }
@@ -2572,11 +2585,12 @@ static const char connection_doc[] =
 PyDoc_STR("SQLite database connection object.");
 
 static PyGetSetDef connection_getset[] = {
-    {"isolation_level",  (getter)pysqlite_connection_get_isolation_level, (setter)pysqlite_connection_set_isolation_level},
-    {"total_changes",  (getter)pysqlite_connection_get_total_changes, (setter)0},
-    {"in_transaction",  (getter)pysqlite_connection_get_in_transaction, (setter)0},
-    {"autocommit",  (getter)get_autocommit, (setter)set_autocommit},
-    {"__text_signature__", get_sig, (setter)0},
+    {"isolation_level", pysqlite_connection_get_isolation_level,
+     pysqlite_connection_set_isolation_level},
+    {"total_changes",  pysqlite_connection_get_total_changes, NULL},
+    {"in_transaction", pysqlite_connection_get_in_transaction, NULL},
+    {"autocommit",  get_autocommit, set_autocommit},
+    {"__text_signature__", get_sig, NULL},
     {NULL}
 };
 
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index 7a748ee3ea0c58..7063be992b5cb2 100644
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -105,6 +105,8 @@ typedef struct
     PyObject* NotSupportedError;
 } pysqlite_Connection;
 
+#define _pysqlite_Connection_CAST(op)   ((pysqlite_Connection *)(op))
+
 int pysqlite_check_thread(pysqlite_Connection* self);
 int pysqlite_check_connection(pysqlite_Connection* con);
 

From 280a89fc094498aba16c38d7b1d2adffe8680fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:52:52 +0100
Subject: [PATCH 3/8] fix UBSan failures for `pysqlite_Cursor`

---
 Modules/_sqlite/cursor.c | 24 ++++++++++++++----------
 Modules/_sqlite/cursor.h |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 24e97fcf1897e9..589654e2cd6b44 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -146,8 +146,9 @@ stmt_reset(pysqlite_Statement *self)
 }
 
 static int
-cursor_traverse(pysqlite_Cursor *self, visitproc visit, void *arg)
+cursor_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    pysqlite_Cursor *self = _pysqlite_Cursor_CAST(op);
     Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->connection);
     Py_VISIT(self->description);
@@ -159,8 +160,9 @@ cursor_traverse(pysqlite_Cursor *self, visitproc visit, void *arg)
 }
 
 static int
-cursor_clear(pysqlite_Cursor *self)
+cursor_clear(PyObject *op)
 {
+    pysqlite_Cursor *self = _pysqlite_Cursor_CAST(op);
     Py_CLEAR(self->connection);
     Py_CLEAR(self->description);
     Py_CLEAR(self->row_cast_map);
@@ -176,14 +178,15 @@ cursor_clear(pysqlite_Cursor *self)
 }
 
 static void
-cursor_dealloc(pysqlite_Cursor *self)
+cursor_dealloc(PyObject *op)
 {
+    pysqlite_Cursor *self = _pysqlite_Cursor_CAST(op);
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_UnTrack(self);
     if (self->in_weakreflist != NULL) {
-        PyObject_ClearWeakRefs((PyObject*)self);
+        PyObject_ClearWeakRefs(op);
     }
-    tp->tp_clear((PyObject *)self);
+    (void)tp->tp_clear(op);
     tp->tp_free(self);
     Py_DECREF(tp);
 }
@@ -1087,8 +1090,9 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
 }
 
 static PyObject *
-pysqlite_cursor_iternext(pysqlite_Cursor *self)
+pysqlite_cursor_iternext(PyObject *op)
 {
+    pysqlite_Cursor *self = _pysqlite_Cursor_CAST(op);
     if (!check_cursor(self)) {
         return NULL;
     }
@@ -1125,7 +1129,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
     }
     if (!Py_IsNone(self->row_factory)) {
         PyObject *factory = self->row_factory;
-        PyObject *args[] = { (PyObject *)self, row, };
+        PyObject *args[] = { op, row, };
         PyObject *new_row = PyObject_Vectorcall(factory, args, 2, NULL);
         Py_SETREF(row, new_row);
     }
@@ -1144,7 +1148,7 @@ pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self)
 {
     PyObject* row;
 
-    row = pysqlite_cursor_iternext(self);
+    row = pysqlite_cursor_iternext((PyObject *)self);
     if (!row && !PyErr_Occurred()) {
         Py_RETURN_NONE;
     }
@@ -1174,7 +1178,7 @@ pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows)
         return NULL;
     }
 
-    while ((row = pysqlite_cursor_iternext(self))) {
+    while ((row = pysqlite_cursor_iternext((PyObject *)self))) {
         if (PyList_Append(list, row) < 0) {
             Py_DECREF(row);
             break;
@@ -1212,7 +1216,7 @@ pysqlite_cursor_fetchall_impl(pysqlite_Cursor *self)
         return NULL;
     }
 
-    while ((row = pysqlite_cursor_iternext(self))) {
+    while ((row = pysqlite_cursor_iternext((PyObject *)self))) {
         if (PyList_Append(list, row) < 0) {
             Py_DECREF(row);
             break;
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
index 42f817af7c54ad..e662d222d2203a 100644
--- a/Modules/_sqlite/cursor.h
+++ b/Modules/_sqlite/cursor.h
@@ -47,6 +47,8 @@ typedef struct
     PyObject* in_weakreflist; /* List of weak references */
 } pysqlite_Cursor;
 
+#define _pysqlite_Cursor_CAST(op)   ((pysqlite_Cursor *)(op))
+
 int pysqlite_cursor_setup_types(PyObject *module);
 
 #endif

From 1f3a63cd9d50717ab9f4efdc52b418fbd6327740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:53:20 +0100
Subject: [PATCH 4/8] suppress unused return values

---
 Modules/_sqlite/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index 698e81d9b897d0..5e9d3217d140b6 100644
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -619,7 +619,7 @@ module_clear(PyObject *module)
 static void
 module_free(void *module)
 {
-    module_clear((PyObject *)module);
+    (void)module_clear((PyObject *)module);
 }
 
 #define ADD_TYPE(module, type)                 \

From 3806f27a839f7867b18ea99f660fc86050182c7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:54:17 +0100
Subject: [PATCH 5/8] fix UBSan failures for `pysqlite_PrepareProtocol`

---
 Modules/_sqlite/prepare_protocol.c | 5 ++---
 Modules/_sqlite/prepare_protocol.h | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Modules/_sqlite/prepare_protocol.c b/Modules/_sqlite/prepare_protocol.c
index 44533225665dab..31092417cb480d 100644
--- a/Modules/_sqlite/prepare_protocol.c
+++ b/Modules/_sqlite/prepare_protocol.c
@@ -24,8 +24,7 @@
 #include "prepare_protocol.h"
 
 static int
-pysqlite_prepare_protocol_init(pysqlite_PrepareProtocol *self, PyObject *args,
-                               PyObject *kwargs)
+pysqlite_prepare_protocol_init(PyObject *self, PyObject *args, PyObject *kwargs)
 {
     return 0;
 }
@@ -38,7 +37,7 @@ pysqlite_prepare_protocol_traverse(PyObject *self, visitproc visit, void *arg)
 }
 
 static void
-pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol *self)
+pysqlite_prepare_protocol_dealloc(PyObject *self)
 {
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_UnTrack(self);
diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h
index afc55a8c1c4eb1..3a63db25a5788e 100644
--- a/Modules/_sqlite/prepare_protocol.h
+++ b/Modules/_sqlite/prepare_protocol.h
@@ -30,6 +30,8 @@ typedef struct
     PyObject_HEAD
 } pysqlite_PrepareProtocol;
 
+#define _pysqlite_PrepareProtocol_CAST(op)  ((pysqlite_PrepareProtocol *)(op))
+
 int pysqlite_prepare_protocol_setup_types(PyObject *module);
 
 #endif

From dd9901247e6d055289535dd4255ee6763f4e6922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:59:24 +0100
Subject: [PATCH 6/8] fix UBSan failures for `pysqlite_Row`

---
 Modules/_sqlite/row.c | 38 +++++++++++++++++++++++++-------------
 Modules/_sqlite/row.h |  2 ++
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c
index 14555076a7e79a..094c9c75de8461 100644
--- a/Modules/_sqlite/row.c
+++ b/Modules/_sqlite/row.c
@@ -39,16 +39,18 @@ class _sqlite3.Row "pysqlite_Row *" "clinic_state()->RowType"
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=966c53403d7f3a40]*/
 
 static int
-row_clear(pysqlite_Row *self)
+row_clear(PyObject *op)
 {
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
     Py_CLEAR(self->data);
     Py_CLEAR(self->description);
     return 0;
 }
 
 static int
-row_traverse(pysqlite_Row *self, visitproc visit, void *arg)
+row_traverse(PyObject *op, visitproc visit, void *arg)
 {
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
     Py_VISIT(Py_TYPE(self));
     Py_VISIT(self->data);
     Py_VISIT(self->description);
@@ -60,7 +62,7 @@ pysqlite_row_dealloc(PyObject *self)
 {
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_UnTrack(self);
-    tp->tp_clear(self);
+    (void)tp->tp_clear(self);
     tp->tp_free(self);
     Py_DECREF(tp);
 }
@@ -94,10 +96,12 @@ pysqlite_row_new_impl(PyTypeObject *type, pysqlite_Cursor *cursor,
     return (PyObject *) self;
 }
 
-PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx)
+static PyObject *
+pysqlite_row_item(PyObject *op, Py_ssize_t idx)
 {
-   PyObject *item = PyTuple_GetItem(self->data, idx);
-   return Py_XNewRef(item);
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
+    PyObject *item = PyTuple_GetItem(self->data, idx);
+    return Py_XNewRef(item);
 }
 
 static int
@@ -129,10 +133,11 @@ equal_ignore_case(PyObject *left, PyObject *right)
 }
 
 static PyObject *
-pysqlite_row_subscript(pysqlite_Row *self, PyObject *idx)
+pysqlite_row_subscript(PyObject *op, PyObject *idx)
 {
     Py_ssize_t _idx;
     Py_ssize_t nitems, i;
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
 
     if (PyLong_Check(idx)) {
         _idx = PyNumber_AsSsize_t(idx, PyExc_IndexError);
@@ -174,8 +179,9 @@ pysqlite_row_subscript(pysqlite_Row *self, PyObject *idx)
 }
 
 static Py_ssize_t
-pysqlite_row_length(pysqlite_Row* self)
+pysqlite_row_length(PyObject *op)
 {
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
     return PyTuple_GET_SIZE(self->data);
 }
 
@@ -208,24 +214,30 @@ pysqlite_row_keys_impl(pysqlite_Row *self)
     return list;
 }
 
-static PyObject* pysqlite_iter(pysqlite_Row* self)
+static PyObject *
+pysqlite_iter(PyObject *op)
 {
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
     return PyObject_GetIter(self->data);
 }
 
-static Py_hash_t pysqlite_row_hash(pysqlite_Row *self)
+static Py_hash_t
+pysqlite_row_hash(PyObject *op)
 {
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
     return PyObject_Hash(self->description) ^ PyObject_Hash(self->data);
 }
 
-static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other, int opid)
+static PyObject *
+pysqlite_row_richcompare(PyObject *op, PyObject *opother, int opid)
 {
     if (opid != Py_EQ && opid != Py_NE)
         Py_RETURN_NOTIMPLEMENTED;
 
+    pysqlite_Row *self = _pysqlite_Row_CAST(op);
     pysqlite_state *state = pysqlite_get_state_by_type(Py_TYPE(self));
-    if (PyObject_TypeCheck(_other, state->RowType)) {
-        pysqlite_Row *other = (pysqlite_Row *)_other;
+    if (PyObject_TypeCheck(opother, state->RowType)) {
+        pysqlite_Row *other = (pysqlite_Row *)opother;
         int eq = PyObject_RichCompareBool(self->description, other->description, Py_EQ);
         if (eq < 0) {
             return NULL;
diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
index d42b781e493177..b3e45aef2e9b2a 100644
--- a/Modules/_sqlite/row.h
+++ b/Modules/_sqlite/row.h
@@ -32,6 +32,8 @@ typedef struct _Row
     PyObject* description;
 } pysqlite_Row;
 
+#define _pysqlite_Row_CAST(op)  ((pysqlite_Row *)(op))
+
 int pysqlite_row_setup_types(PyObject *module);
 
 #endif

From 1f54d11b5bb086aa354f8d7576d02345c0247cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 18:00:39 +0100
Subject: [PATCH 7/8] fix UBSan failures for `pysqlite_Statement`

---
 Modules/_sqlite/statement.c | 7 ++++---
 Modules/_sqlite/statement.h | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index 229bfc3b504165..ef391c79952e34 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -99,10 +99,11 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql)
 }
 
 static void
-stmt_dealloc(pysqlite_Statement *self)
+stmt_dealloc(PyObject *op)
 {
+    pysqlite_Statement *self = _pysqlite_Statement_CAST(op);
     PyTypeObject *tp = Py_TYPE(self);
-    PyObject_GC_UnTrack(self);
+    PyObject_GC_UnTrack(op);
     if (self->st) {
         Py_BEGIN_ALLOW_THREADS
         sqlite3_finalize(self->st);
@@ -114,7 +115,7 @@ stmt_dealloc(pysqlite_Statement *self)
 }
 
 static int
-stmt_traverse(pysqlite_Statement *self, visitproc visit, void *arg)
+stmt_traverse(PyObject *self, visitproc visit, void *arg)
 {
     Py_VISIT(Py_TYPE(self));
     return 0;
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
index b18f170ebb0708..5a696f18c82632 100644
--- a/Modules/_sqlite/statement.h
+++ b/Modules/_sqlite/statement.h
@@ -35,6 +35,8 @@ typedef struct
     int is_dml;
 } pysqlite_Statement;
 
+#define _pysqlite_Statement_CAST(op)    ((pysqlite_Statement *)(op))
+
 pysqlite_Statement *pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql);
 
 int pysqlite_statement_setup_types(PyObject *module);

From 63afc083298428ce725679071f28ba01d091aa7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Mon, 20 Jan 2025 18:35:30 +0100
Subject: [PATCH 8/8] move cast macros to `.c` files

---
 Modules/_sqlite/blob.c             | 2 ++
 Modules/_sqlite/blob.h             | 2 --
 Modules/_sqlite/connection.c       | 2 ++
 Modules/_sqlite/connection.h       | 2 --
 Modules/_sqlite/cursor.c           | 2 ++
 Modules/_sqlite/cursor.h           | 2 --
 Modules/_sqlite/prepare_protocol.h | 2 --
 Modules/_sqlite/row.c              | 2 ++
 Modules/_sqlite/row.h              | 2 --
 Modules/_sqlite/statement.c        | 2 ++
 Modules/_sqlite/statement.h        | 2 --
 11 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Modules/_sqlite/blob.c b/Modules/_sqlite/blob.c
index e4a2439e9eed86..390375628bfb4f 100644
--- a/Modules/_sqlite/blob.c
+++ b/Modules/_sqlite/blob.c
@@ -9,6 +9,8 @@
 #include "clinic/blob.c.h"
 #undef clinic_state
 
+#define _pysqlite_Blob_CAST(op) ((pysqlite_Blob *)(op))
+
 /*[clinic input]
 module _sqlite3
 class _sqlite3.Blob "pysqlite_Blob *" "clinic_state()->BlobType"
diff --git a/Modules/_sqlite/blob.h b/Modules/_sqlite/blob.h
index d985c7788b52ce..418ca03bdb51d1 100644
--- a/Modules/_sqlite/blob.h
+++ b/Modules/_sqlite/blob.h
@@ -18,8 +18,6 @@ typedef struct {
     PyObject *in_weakreflist;
 } pysqlite_Blob;
 
-#define _pysqlite_Blob_CAST(op) ((pysqlite_Blob *)(op))
-
 int pysqlite_blob_setup_types(PyObject *mod);
 void pysqlite_close_all_blobs(pysqlite_Connection *self);
 
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 3dacafd0d1ec5f..30df852bcc6ec0 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -136,6 +136,8 @@ sqlite3_int64_converter(PyObject *obj, sqlite3_int64 *result)
 #include "clinic/connection.c.h"
 #undef clinic_state
 
+#define _pysqlite_Connection_CAST(op)   ((pysqlite_Connection *)(op))
+
 /*[clinic input]
 module _sqlite3
 class _sqlite3.Connection "pysqlite_Connection *" "clinic_state()->ConnectionType"
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index 7063be992b5cb2..7a748ee3ea0c58 100644
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -105,8 +105,6 @@ typedef struct
     PyObject* NotSupportedError;
 } pysqlite_Connection;
 
-#define _pysqlite_Connection_CAST(op)   ((pysqlite_Connection *)(op))
-
 int pysqlite_check_thread(pysqlite_Connection* self);
 int pysqlite_check_connection(pysqlite_Connection* con);
 
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 589654e2cd6b44..02d598040775b0 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -44,6 +44,8 @@ typedef enum {
 #include "clinic/cursor.c.h"
 #undef clinic_state
 
+#define _pysqlite_Cursor_CAST(op)   ((pysqlite_Cursor *)(op))
+
 static inline int
 check_cursor_locked(pysqlite_Cursor *cur)
 {
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
index e662d222d2203a..42f817af7c54ad 100644
--- a/Modules/_sqlite/cursor.h
+++ b/Modules/_sqlite/cursor.h
@@ -47,8 +47,6 @@ typedef struct
     PyObject* in_weakreflist; /* List of weak references */
 } pysqlite_Cursor;
 
-#define _pysqlite_Cursor_CAST(op)   ((pysqlite_Cursor *)(op))
-
 int pysqlite_cursor_setup_types(PyObject *module);
 
 #endif
diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h
index 3a63db25a5788e..afc55a8c1c4eb1 100644
--- a/Modules/_sqlite/prepare_protocol.h
+++ b/Modules/_sqlite/prepare_protocol.h
@@ -30,8 +30,6 @@ typedef struct
     PyObject_HEAD
 } pysqlite_PrepareProtocol;
 
-#define _pysqlite_PrepareProtocol_CAST(op)  ((pysqlite_PrepareProtocol *)(op))
-
 int pysqlite_prepare_protocol_setup_types(PyObject *module);
 
 #endif
diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c
index 094c9c75de8461..79660008b180dc 100644
--- a/Modules/_sqlite/row.c
+++ b/Modules/_sqlite/row.c
@@ -32,6 +32,8 @@
 #include "clinic/row.c.h"
 #undef clinic_state
 
+#define _pysqlite_Row_CAST(op)  ((pysqlite_Row *)(op))
+
 /*[clinic input]
 module _sqlite3
 class _sqlite3.Row "pysqlite_Row *" "clinic_state()->RowType"
diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
index b3e45aef2e9b2a..d42b781e493177 100644
--- a/Modules/_sqlite/row.h
+++ b/Modules/_sqlite/row.h
@@ -32,8 +32,6 @@ typedef struct _Row
     PyObject* description;
 } pysqlite_Row;
 
-#define _pysqlite_Row_CAST(op)  ((pysqlite_Row *)(op))
-
 int pysqlite_row_setup_types(PyObject *module);
 
 #endif
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index ef391c79952e34..facced0dfbfafd 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -25,6 +25,8 @@
 #include "statement.h"
 #include "util.h"
 
+#define _pysqlite_Statement_CAST(op)    ((pysqlite_Statement *)(op))
+
 /* prototypes */
 static const char *lstrip_sql(const char *sql);
 
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
index 5a696f18c82632..b18f170ebb0708 100644
--- a/Modules/_sqlite/statement.h
+++ b/Modules/_sqlite/statement.h
@@ -35,8 +35,6 @@ typedef struct
     int is_dml;
 } pysqlite_Statement;
 
-#define _pysqlite_Statement_CAST(op)    ((pysqlite_Statement *)(op))
-
 pysqlite_Statement *pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql);
 
 int pysqlite_statement_setup_types(PyObject *module);