Skip to content

gh-152817: Prevent deletion of sqlite3 cursor.row_factory attr, missed from: gh-149738 #152818

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.

Sign up for GitHub

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

Merged
serhiy-storchaka merged 7 commits into from
Aug 21, 2026
Merged

gh-152817: Prevent deletion of sqlite3 cursor.row_factory attr, missed from: gh-149738 #152818

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
beb6a26
Add test showing del cursor.row_factory then executing query causes s…
stestagg Jul 1, 2026
6db8641
Add __delattr__ guard to sqlite3 `cursor.row_factory` attr to
stestagg Jul 1, 2026
3d7bd8f
Amend the existing NEWS blurb
stestagg Jul 1, 2026
f297152
Defensive mode: Initialize factories in tp_new,
stestagg Jul 3, 2026
f09a339
Put back the quoting around attribute mentions
stestagg Jul 3, 2026
110140b
Revert the fix for code that doesn't call __init__on Cursor/Connectio…
stestagg Jul 3, 2026
3d4a61a
Apply the style nitpicks.
serhiy-storchaka Aug 21, 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
8 changes: 8 additions & 0 deletions Lib/test/test_sqlite3/test_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,14 @@ def test_delete_connection_text_factory(self):
with self.assertRaises(AttributeError):
del self.con.text_factory

def test_delete_cursor_row_factory(self):
# gh-149738: deleting row_factory should raise an exception
cur = self.con.cursor()
with self.assertRaises(AttributeError):
del cur.row_factory
# Executing a query here should succeed.
self.assertEqual(tuple(cur.execute("select 1").fetchone()), (1,))
Comment thread
serhiy-storchaka marked this conversation as resolved.
Resolved

def test_sqlite_row_index_unicode(self):
row = self.con.execute("select 1 as \xff").fetchone()
self.assertEqual(row["\xff"], 1)
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/Core_and_Builtins/2026-05-13-06-54-41.gh-issue-149738.4BLFoH.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
:mod:`sqlite3`: Disallow removing ``row_factory`` and ``text_factory`` attributes
of a connection to prevent a crash on a query.
of a connection or cursor to prevent a crash on a query.
22 changes: 21 additions & 1 deletion Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,13 +1400,33 @@ static struct PyMemberDef cursor_members[] =
{"description", _Py_T_OBJECT, offsetof(pysqlite_Cursor, description), Py_READONLY},
{"lastrowid", _Py_T_OBJECT, offsetof(pysqlite_Cursor, lastrowid), Py_READONLY},
{"rowcount", Py_T_LONG, offsetof(pysqlite_Cursor, rowcount), Py_READONLY},
{"row_factory", _Py_T_OBJECT, offsetof(pysqlite_Cursor, row_factory), 0},
{"__weaklistoffset__", Py_T_PYSSIZET, offsetof(pysqlite_Cursor, in_weakreflist), Py_READONLY},
{NULL}
};

static PyObject *
cursor_get_row_factory(PyObject *op, void *closure)

@serhiy-storchaka serhiy-storchaka Aug 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style nitpick: use Py_UNUSED(closure).

{
pysqlite_Cursor *self = (pysqlite_Cursor *)op;

@serhiy-storchaka serhiy-storchaka Aug 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use _pysqlite_Cursor_CAST().

return Py_NewRef(self->row_factory);
}

static int
cursor_set_row_factory(PyObject *op, PyObject *value, void *closure)
{
pysqlite_Cursor *self = (pysqlite_Cursor *)op;

@serhiy-storchaka serhiy-storchaka Aug 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same.

if (value == NULL) {
PyErr_SetString(PyExc_AttributeError,
"cannot delete row_factory attribute");
return -1;
}
Py_XSETREF(self->row_factory, Py_NewRef(value));
Comment thread
sobolevn marked this conversation as resolved.
Resolved
return 0;
}

static struct PyGetSetDef cursor_getsets[] = {
_SQLITE3_CURSOR_ARRAYSIZE_GETSETDEF
{"row_factory", cursor_get_row_factory, cursor_set_row_factory},
{NULL},
};

Expand Down
Loading