pythongh-129346: Handle allocation errors for SQLite aggregate context (

pythonGH-129347) (cherry picked from commit 379ab85) Co-authored-by: Erlend E. Aasland <[email protected]>
miss-islington · Jan 27, 2025 · 197c115 · 197c115
1 parent d7d4edf
commit 197c115
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Misc/NEWS.d/next/Library/2025-01-27-14-05-19.gh-issue-129346.gZRd3g.rst b/Misc/NEWS.d/next/Library/2025-01-27-14-05-19.gh-issue-129346.gZRd3g.rst
@@ -0,0 +1,2 @@
+In :mod:`sqlite3`, handle out-of-memory when creating user-defined SQL
+functions.
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -958,6 +958,11 @@ step_callback(sqlite3_context *context, int argc, sqlite3_value **params)
     assert(ctx != NULL);
 
     aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
+    if (aggregate_instance == NULL) {
+        (void)PyErr_NoMemory();
+        set_sqlite_error(context, "unable to allocate SQLite aggregate context");
+        goto error;
+    }
     if (*aggregate_instance == NULL) {
         *aggregate_instance = PyObject_CallNoArgs(ctx->callable);
         if (!*aggregate_instance) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		In :mod:`sqlite3`, handle out-of-memory when creating user-defined SQL
		functions.