-
-
Notifications
You must be signed in to change notification settings - Fork 33.8k
gh-143198: fix some crashes in sqlite3.executemany with concurrent mutations
#143210
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
picnixz
wants to merge
15
commits into
python:main
Choose a base branch
from
picnixz:fix/sqlite/uaf-in-cursor-143198
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+265
−67
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
037b421
gh-143198: fix SIGSEGV in `sqlite3.execute[many]` with re-entrant par…
picnixz cc0f483
Update Misc/NEWS.d/next/Library/2025-12-27-10-36-18.gh-issue-143198.D…
picnixz 3952cfe
Merge branch 'main' into fix/sqlite/uaf-in-cursor-143198
picnixz b0c8b16
correctly fix `sqlite3`'s `executemany`
picnixz ae2a5de
fix lint
picnixz f9f5416
add assertions
picnixz 3b50390
protect against parmeters with bad values
picnixz baa7eec
.
picnixz f25c1f4
improve tests
picnixz d1bb010
test coverage for connections
picnixz a0026e3
split implementation of execute() and executemany()
picnixz e00919d
reduce diff
picnixz f0c5c4d
simplify test cases
picnixz 75b2a0c
hard reduce the diff
picnixz 049e663
Merge branch 'main' into fix/sqlite/uaf-in-cursor-143198
picnixz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -728,6 +728,21 @@ def test_database_keyword(self): | |
| self.assertEqual(type(cx), sqlite.Connection) | ||
|
|
||
|
|
||
| class ParamsCxCloseInIterMany: | ||
| def __init__(self, cx): | ||
| self.cx = cx | ||
|
|
||
| def __iter__(self): | ||
| self.cx.close() | ||
| return iter([(1,), (2,), (3,)]) | ||
|
|
||
|
|
||
| def ParamsCxCloseInNext(cx): | ||
| for i in range(10): | ||
| cx.close() | ||
| yield (i,) | ||
|
|
||
|
|
||
| class CursorTests(unittest.TestCase): | ||
| def setUp(self): | ||
| self.cx = sqlite.connect(":memory:") | ||
|
|
@@ -859,6 +874,31 @@ def __getitem__(slf, x): | |
| with self.assertRaises(ZeroDivisionError): | ||
| self.cu.execute("select name from test where name=?", L()) | ||
|
|
||
| def test_execute_use_after_close_with_bind_parameters(self): | ||
| # Prevent SIGSEGV when closing the connection while binding parameters. | ||
| # | ||
| # Internally, the connection's state is checked after bind_parameters(). | ||
| # Without this check, we would only be aware of the closed connection | ||
| # by calling an sqlite3 function afterwards. However, it is important | ||
| # that we report the error before leaving the execute() call. | ||
| # | ||
| # Regression test for https://github.com/python/cpython/issues/143198. | ||
|
|
||
| class PT: | ||
| def __getitem__(self, i): | ||
| cx.close() | ||
| return 1 | ||
| def __len__(self): | ||
| return 1 | ||
|
|
||
| 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.execute("insert into tmp(a) values (?)", PT()) | ||
|
|
||
| def test_execute_named_param_and_sequence(self): | ||
| dataset = ( | ||
| ("select :a", (1,)), | ||
|
|
@@ -1030,6 +1070,50 @@ 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)) | ||
|
|
||
| @subTests(("j", "n"), ([0, 1], [0, 3], [1, 3], [2, 3])) | ||
| @subTests("wtype", (list, lambda x: x)) | ||
| def test_executemany_use_after_close_with_bind_parameters(self, j, n, wtype): | ||
| # Prevent SIGSEGV when closing the connection while binding parameters. | ||
| # | ||
| # Internally, the connection's state is checked after bind_parameters(). | ||
| # Without this check, we would only be aware of the closed connection | ||
| # by calling an sqlite3 function afterwards. However, it is important | ||
| # that we report the error before leaving executemany() call. | ||
| # | ||
| # 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) | ||
|
|
||
| class PT: | ||
| def __init__(self, value): | ||
| self.value = value | ||
| def __getitem__(self, i): | ||
| if self.value == j: | ||
| cx.close() | ||
| return self.value | ||
| def __len__(self): | ||
| return 1 | ||
|
|
||
| cu = cx.cursor() | ||
| msg = r"Cannot operate on a closed database\." | ||
| items = iter(wtype(map(PT, range(n)))) | ||
| with self.assertRaisesRegex(sqlite.ProgrammingError, msg): | ||
| cu.executemany("insert into tmp(a) values (?)", items) | ||
|
|
||
| def test_fetch_iter(self): | ||
| # Optional DB-API extension. | ||
| self.cu.execute("delete from test") | ||
|
|
@@ -1711,6 +1795,24 @@ def test_connection_execute(self): | |
| result = self.con.execute("select 5").fetchone()[0] | ||
| self.assertEqual(result, 5, "Basic test of Connection.execute") | ||
|
|
||
| def test_connection_execute_use_after_close_with_bind_parameters(self): | ||
| # See CursorTests.test_execute_use_after_close_with_bind_parameters(). | ||
|
|
||
| cx = sqlite.connect(":memory:") | ||
| cx.execute("create table tmp(a number)") | ||
| self.addCleanup(cx.close) | ||
|
|
||
| class PT: | ||
| def __getitem__(self, i): | ||
| cx.close() | ||
| return 1 | ||
| def __len__(self): | ||
| return 1 | ||
|
|
||
| msg = r"Cannot operate on a closed database\." | ||
| with self.assertRaisesRegex(sqlite.ProgrammingError, msg): | ||
| cx.execute("insert into tmp(a) values (?)", PT()) | ||
|
|
||
| def test_connection_executemany(self): | ||
| con = self.con | ||
| con.execute("create table test(foo)") | ||
|
|
@@ -1719,6 +1821,43 @@ 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)) | ||
| 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)) | ||
|
|
||
| @subTests(("j", "n"), ([0, 1], [0, 3], [1, 3], [2, 3])) | ||
| @subTests("wtype", (list, lambda x: x)) | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll use a better name here, as document what "j" and "n" are (they are just here to control when we close the connection) |
||
| def test_connection_executemany_use_after_close_with_bind_parameters( | ||
| self, j, n, wtype, | ||
| ): | ||
| # See CursorTests.test_executemany_use_after_close_with_bind_parameters(). | ||
|
|
||
| cx = sqlite.connect(":memory:") | ||
| cx.execute("create table tmp(a number)") | ||
| self.addCleanup(cx.close) | ||
|
|
||
| class PT: | ||
| def __init__(self, value): | ||
| self.value = value | ||
| def __getitem__(self, i): | ||
| if self.value == j: | ||
| cx.close() | ||
| return self.value | ||
| def __len__(self): | ||
| return 1 | ||
|
|
||
| items = iter(wtype(map(PT, range(n)))) | ||
| msg = r"Cannot operate on a closed database\." | ||
| with self.assertRaisesRegex(sqlite.ProgrammingError, msg): | ||
| cx.executemany("insert into tmp(a) values (?)", items) | ||
|
|
||
| def test_connection_executescript(self): | ||
| con = self.con | ||
| con.executescript(""" | ||
|
|
||
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/Library/2025-12-27-10-36-18.gh-issue-143198.DdIHyC.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| the query's parameters closes the current connection. Patch by Bénédikt Tran. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I should probably name this "params_factory"