Add connection as backref to callback context

Erlend E. Aasland · Erlend E. Aasland · commit a2d3eae2dabb · 2021-09-08T22:43:38.000+02:00
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -223,6 +223,7 @@ pysqlite_do_all_statements(pysqlite_Connection *self)
 do {                                \
     if (ctx) {                      \
         Py_VISIT(ctx->callable);    \
+        Py_VISIT(ctx->connection);  \
     }                               \
 } while (0)
 
@@ -247,6 +248,7 @@ clear_callback_context(callback_context *ctx)
 {
     if (ctx != NULL) {
         Py_CLEAR(ctx->callable);
+        Py_CLEAR(ctx->connection);
     }
 }
 
@@ -816,12 +818,13 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
 }
 
 static callback_context *
-create_callback_context(pysqlite_state *state, PyObject *callable)
+create_callback_context(pysqlite_Connection *con, PyObject *callable)
 {
     callback_context *ctx = PyMem_Malloc(sizeof(callback_context));
     if (ctx != NULL) {
         ctx->callable = Py_NewRef(callable);
-        ctx->state = state;
+        ctx->state = con->state;
+        ctx->connection = Py_NewRef(con);
     }
     return ctx;
 }
@@ -831,6 +834,7 @@ free_callback_context(callback_context *ctx)
 {
     assert(ctx != NULL);
     Py_XDECREF(ctx->callable);
+    Py_XDECREF(ctx->connection);
     PyMem_Free(ctx);
 }
 
@@ -896,7 +900,7 @@ pysqlite_connection_create_function_impl(pysqlite_Connection *self,
         flags |= SQLITE_DETERMINISTIC;
 #endif
     }
-    callback_context *ctx = create_callback_context(self->state, func);
+    callback_context *ctx = create_callback_context(self, func);
     if (ctx == NULL) {
         return NULL;
     }
@@ -936,8 +940,7 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self,
         return NULL;
     }
 
-    callback_context *ctx = create_callback_context(self->state,
-                                                    aggregate_class);
+    callback_context *ctx = create_callback_context(self, aggregate_class);
     if (ctx == NULL) {
         return NULL;
     }
@@ -1088,7 +1091,7 @@ pysqlite_connection_set_authorizer_impl(pysqlite_Connection *self,
         set_callback_context(&self->authorizer_ctx, NULL);
     }
     else {
-        callback_context *ctx = create_callback_context(self->state, callable);
+        callback_context *ctx = create_callback_context(self, callable);
         if (ctx == NULL) {
             return NULL;
         }
@@ -1128,7 +1131,7 @@ pysqlite_connection_set_progress_handler_impl(pysqlite_Connection *self,
         set_callback_context(&self->progress_ctx, NULL);
     }
     else {
-        callback_context *ctx = create_callback_context(self->state, callable);
+        callback_context *ctx = create_callback_context(self, callable);
         if (ctx == NULL) {
             return NULL;
         }
@@ -1173,7 +1176,7 @@ pysqlite_connection_set_trace_callback_impl(pysqlite_Connection *self,
         set_callback_context(&self->trace_ctx, NULL);
     }
     else {
-        callback_context *ctx = create_callback_context(self->state, callable);
+        callback_context *ctx = create_callback_context(self, callable);
         if (ctx == NULL) {
             return NULL;
         }
@@ -1766,7 +1769,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,
             PyErr_SetString(PyExc_TypeError, "parameter must be callable");
             return NULL;
         }
-        ctx = create_callback_context(self->state, callable);
+        ctx = create_callback_context(self, callable);
         if (ctx == NULL) {
             return NULL;
         }
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
@@ -35,6 +35,7 @@
 typedef struct _callback_context
 {
     PyObject *callable;
+    PyObject *connection;
     pysqlite_state *state;
 } callback_context;
 

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ pysqlite_do_all_statements(pysqlite_Connection *self)`
`223`	`223`	`do { \`
`224`	`224`	`if (ctx) { \`
`225`	`225`	`Py_VISIT(ctx->callable); \`
	`226`	`+ Py_VISIT(ctx->connection); \`
`226`	`227`	`} \`
`227`	`228`	`} while (0)`
`228`	`229`
`@@ -247,6 +248,7 @@ clear_callback_context(callback_context *ctx)`
`247`	`248`	`{`
`248`	`249`	`if (ctx != NULL) {`
`249`	`250`	`Py_CLEAR(ctx->callable);`
	`251`	`+ Py_CLEAR(ctx->connection);`
`250`	`252`	`}`
`251`	`253`	`}`
`252`	`254`
`@@ -816,12 +818,13 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)`
`816`	`818`	`}`
`817`	`819`
`818`	`820`	`static callback_context *`
`819`		`-create_callback_context(pysqlite_state state, PyObject callable)`
	`821`	`+create_callback_context(pysqlite_Connection con, PyObject callable)`
`820`	`822`	`{`
`821`	`823`	`callback_context *ctx = PyMem_Malloc(sizeof(callback_context));`
`822`	`824`	`if (ctx != NULL) {`
`823`	`825`	`ctx->callable = Py_NewRef(callable);`
`824`		`- ctx->state = state;`
	`826`	`+ ctx->state = con->state;`
	`827`	`+ ctx->connection = Py_NewRef(con);`
`825`	`828`	`}`
`826`	`829`	`return ctx;`
`827`	`830`	`}`
`@@ -831,6 +834,7 @@ free_callback_context(callback_context *ctx)`
`831`	`834`	`{`
`832`	`835`	`assert(ctx != NULL);`
`833`	`836`	`Py_XDECREF(ctx->callable);`
	`837`	`+ Py_XDECREF(ctx->connection);`
`834`	`838`	`PyMem_Free(ctx);`
`835`	`839`	`}`
`836`	`840`
`@@ -896,7 +900,7 @@ pysqlite_connection_create_function_impl(pysqlite_Connection *self,`
`896`	`900`	`flags \|= SQLITE_DETERMINISTIC;`
`897`	`901`	`#endif`
`898`	`902`	`}`
`899`		`- callback_context *ctx = create_callback_context(self->state, func);`
	`903`	`+ callback_context *ctx = create_callback_context(self, func);`
`900`	`904`	`if (ctx == NULL) {`
`901`	`905`	`return NULL;`
`902`	`906`	`}`
`@@ -936,8 +940,7 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self,`
`936`	`940`	`return NULL;`
`937`	`941`	`}`
`938`	`942`
`939`		`- callback_context *ctx = create_callback_context(self->state,`
`940`		`- aggregate_class);`
	`943`	`+ callback_context *ctx = create_callback_context(self, aggregate_class);`
`941`	`944`	`if (ctx == NULL) {`
`942`	`945`	`return NULL;`
`943`	`946`	`}`
`@@ -1088,7 +1091,7 @@ pysqlite_connection_set_authorizer_impl(pysqlite_Connection *self,`
`1088`	`1091`	`set_callback_context(&self->authorizer_ctx, NULL);`
`1089`	`1092`	`}`
`1090`	`1093`	`else {`
`1091`		`- callback_context *ctx = create_callback_context(self->state, callable);`
	`1094`	`+ callback_context *ctx = create_callback_context(self, callable);`
`1092`	`1095`	`if (ctx == NULL) {`
`1093`	`1096`	`return NULL;`
`1094`	`1097`	`}`
`@@ -1128,7 +1131,7 @@ pysqlite_connection_set_progress_handler_impl(pysqlite_Connection *self,`
`1128`	`1131`	`set_callback_context(&self->progress_ctx, NULL);`
`1129`	`1132`	`}`
`1130`	`1133`	`else {`
`1131`		`- callback_context *ctx = create_callback_context(self->state, callable);`
	`1134`	`+ callback_context *ctx = create_callback_context(self, callable);`
`1132`	`1135`	`if (ctx == NULL) {`
`1133`	`1136`	`return NULL;`
`1134`	`1137`	`}`
`@@ -1173,7 +1176,7 @@ pysqlite_connection_set_trace_callback_impl(pysqlite_Connection *self,`
`1173`	`1176`	`set_callback_context(&self->trace_ctx, NULL);`
`1174`	`1177`	`}`
`1175`	`1178`	`else {`
`1176`		`- callback_context *ctx = create_callback_context(self->state, callable);`
	`1179`	`+ callback_context *ctx = create_callback_context(self, callable);`
`1177`	`1180`	`if (ctx == NULL) {`
`1178`	`1181`	`return NULL;`
`1179`	`1182`	`}`
`@@ -1766,7 +1769,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,`
`1766`	`1769`	`PyErr_SetString(PyExc_TypeError, "parameter must be callable");`
`1767`	`1770`	`return NULL;`
`1768`	`1771`	`}`
`1769`		`- ctx = create_callback_context(self->state, callable);`
	`1772`	`+ ctx = create_callback_context(self, callable);`
`1770`	`1773`	`if (ctx == NULL) {`
`1771`	`1774`	`return NULL;`
`1772`	`1775`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`typedef struct _callback_context`
`36`	`36`	`{`
`37`	`37`	`PyObject *callable;`
	`38`	`+ PyObject *connection;`
`38`	`39`	`pysqlite_state *state;`
`39`	`40`	`} callback_context;`
`40`	`41`