bpo-43258: Don't allocate sqlite3 aggregate context for empty queries (GH-24569)
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 63fcb00..39b55fc 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -708,8 +708,12 @@ void _pysqlite_final_callback(sqlite3_context* context)
threadstate = PyGILState_Ensure();
- aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
- if (!*aggregate_instance) {
+ aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, 0);
+ if (aggregate_instance == NULL) {
+ /* No rows matched the query; the step handler was never called. */
+ goto error;
+ }
+ else if (!*aggregate_instance) {
/* this branch is executed if there was an exception in the aggregate's
* __init__ */