Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
037b421
gh-143198: fix SIGSEGV in `sqlite3.execute[many]` with re-entrant par…
picnixz Dec 27, 2025
cc0f483
Update Misc/NEWS.d/next/Library/2025-12-27-10-36-18.gh-issue-143198.D…
picnixz Dec 27, 2025
3952cfe
Merge branch 'main' into fix/sqlite/uaf-in-cursor-143198
picnixz Dec 27, 2025
b0c8b16
correctly fix `sqlite3`'s `executemany`
picnixz Dec 27, 2025
ae2a5de
fix lint
picnixz Dec 27, 2025
f9f5416
add assertions
picnixz Dec 29, 2025
3b50390
protect against parmeters with bad values
picnixz Dec 29, 2025
baa7eec
.
picnixz Dec 29, 2025
f25c1f4
improve tests
picnixz Dec 29, 2025
d1bb010
test coverage for connections
picnixz Dec 29, 2025
a0026e3
split implementation of execute() and executemany()
picnixz Dec 29, 2025
e00919d
reduce diff
picnixz Dec 29, 2025
f0c5c4d
simplify test cases
picnixz Dec 29, 2025
75b2a0c
hard reduce the diff
picnixz Dec 31, 2025
049e663
Merge branch 'main' into fix/sqlite/uaf-in-cursor-143198
picnixz Dec 31, 2025
a10fec4
improve test docs
picnixz Jan 1, 2026
9697a16
Merge branch 'main' into fix/sqlite/uaf-in-cursor-143198
serhiy-storchaka Jan 9, 2026
2fab94a
Reduce the diff a bit more.
picnixz Jan 9, 2026
fe5b799
Reduce the diff again
picnixz Jan 9, 2026
3eaccab
update test names
picnixz Jan 10, 2026
bc0e186
update NEWS entry
picnixz Jan 10, 2026
263038c
defer connection sanity checks to `bind_param`'s callers
picnixz Jan 10, 2026
e78dc57
fixup! remove redundant check after calling `PySequence_Size`
picnixz Jan 10, 2026
36607ac
refactor! move regression tests in their own class to easily extend them
picnixz Jan 10, 2026
295370a
test! significantly increase test coverage
picnixz Jan 10, 2026
6757ed4
fixup! remove unused import
picnixz Jan 10, 2026
ffde2e2
chore! improve readability
picnixz Jan 10, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion Lib/test/test_sqlite3/test_dbapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import warnings

from test.support import (
SHORT_TIMEOUT, check_disallow_instantiation, requires_subprocess
SHORT_TIMEOUT, check_disallow_instantiation, requires_subprocess, subTests
)
from test.support import gc_collect
from test.support import threading_helper, import_helper
Expand Down Expand Up @@ -728,6 +728,33 @@ def test_database_keyword(self):
self.assertEqual(type(cx), sqlite.Connection)


class CxWrapper:
def __init__(self, cx):
self.cx = cx

def side_effect(self):
self.cx.close()


class ParamsCxCloseInIterMany(CxWrapper):
def __iter__(self):
self.side_effect()
return iter([(1,), (2,), (3,)])


class ParamsCxCloseInNext(CxWrapper):
Comment thread
picnixz marked this conversation as resolved.
Outdated
def __init__(self, cx):
super().__init__(cx)
self.r = iter(range(10))

def __iter__(self):
return self

def __next__(self):
self.side_effect()
return (next(self.r),)


class CursorTests(unittest.TestCase):
def setUp(self):
self.cx = sqlite.connect(":memory:")
Expand Down Expand Up @@ -1030,6 +1057,18 @@ def test_execute_many_not_iterable(self):
with self.assertRaises(TypeError):
self.cu.executemany("insert into test(income) values (?)", 42)

@subTests("params_class", (ParamsCxCloseInIterMany, ParamsCxCloseInNext))
def test_executemany_use_after_close(self, params_class):
# Prevent SIGSEGV with iterable of parameters closing the connection.
# Regression test for https://github.com/python/cpython/issues/143198.
cx = sqlite.connect(":memory:")
cx.execute("create table tmp(a number)")
self.addCleanup(cx.close)
cu = cx.cursor()
msg = r"Cannot operate on a closed database\."
with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
cu.executemany("insert into tmp(a) values (?)", params_class(cx))

def test_fetch_iter(self):
# Optional DB-API extension.
self.cu.execute("delete from test")
Expand Down Expand Up @@ -1719,6 +1758,17 @@ def test_connection_executemany(self):
self.assertEqual(result[0][0], 3, "Basic test of Connection.executemany")
self.assertEqual(result[1][0], 4, "Basic test of Connection.executemany")

@subTests("params_class", (ParamsCxCloseInIterMany, ParamsCxCloseInNext))
Comment thread
picnixz marked this conversation as resolved.
Outdated
def test_connection_executemany_use_after_close(self, params_class):
# Prevent SIGSEGV with iterable of parameters closing the connection.
# Regression test for https://github.com/python/cpython/issues/143198.
cx = sqlite.connect(":memory:")
cx.execute("create table tmp(a number)")
self.addCleanup(cx.close)
msg = r"Cannot operate on a closed database\."
with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
cx.executemany("insert into tmp(a) values (?)", params_class(cx))

def test_connection_executescript(self):
con = self.con
con.executescript("""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:mod:`sqlite3`: fix crashes in :meth:`Connection.executemany <sqlite3.Connection.executemany>`
and :meth:`Cursor.executemany <sqlite3.Cursor.executemany>` when iterating over
Comment thread
picnixz marked this conversation as resolved.
Outdated
the query's parameters closes the current connection. Patch by Bénédikt Tran.
11 changes: 11 additions & 0 deletions Modules/_sqlite/cursor.c
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,12 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
}
}

// PyObject_GetIter() may have a side-effect on the connection's state.
// See: https://github.com/python/cpython/issues/143198.
if (!pysqlite_check_connection(self->connection)) {
Comment thread
picnixz marked this conversation as resolved.
Outdated
goto error;
}

/* reset description */
Py_INCREF(Py_None);
Py_SETREF(self->description, Py_None);
Expand Down Expand Up @@ -925,6 +931,11 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
if (!parameters) {
break;
}
// PyIter_Next() may have a side-effect on the connection's state.
Comment thread
picnixz marked this conversation as resolved.
Outdated
// See: https://github.com/python/cpython/issues/143198.
if (!pysqlite_check_connection(self->connection)) {
Comment thread
picnixz marked this conversation as resolved.
goto error;
}

bind_parameters(state, self->statement, parameters);
if (PyErr_Occurred()) {
Expand Down
Loading