From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Mon, 27 Jan 2025 17:33:18 +0000 (+0100) Subject: [3.12] gh-129346: Handle allocation errors for SQLite aggregate context (GH-129347... X-Git-Tag: v3.12.9~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23faf5f2dca009f7cc18840246de405dbb7fce9f;p=thirdparty%2FPython%2Fcpython.git [3.12] gh-129346: Handle allocation errors for SQLite aggregate context (GH-129347) (#129373) (cherry picked from commit 379ab856f59423c570333403a7d5d72f3ea82d52) Co-authored-by: Erlend E. Aasland --- 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 new file mode 100644 index 000000000000..b5377277f6c5 --- /dev/null +++ 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 index 12e5c135aafa..1450037ca95c 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -927,6 +927,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) {