Skip to content

[3.8] gh-80254: Disallow recursive usage of cursors in sqlite3 converters #92333

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
ambv merged 3 commits into from
May 16, 2022
+77 −14
Merged

[3.8] gh-80254: Disallow recursive usage of cursors in sqlite3 converters #92333

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dc3259
[3.8] gh-80254: Disallow recursive usage of cursors in `sqlite3` conv…
erlend-aasland May 3, 2022
fc07267
Fix ref leak in pysqlite_cursor_iternext
erlend-aasland May 5, 2022
88b09dc
Explicitly free resources at test tearDown()
erlend-aasland May 5, 2022
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
Prev Previous commit
Next Next commit
Fix ref leak in pysqlite_cursor_iternext
  • Loading branch information
@erlend-aasland
erlend-aasland committed May 5, 2022
commit fc072677f099c370564f3f82a7d4849002a4baea
16 changes: 8 additions & 8 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,29 +773,29 @@ PyObject* pysqlite_cursor_iternext(pysqlite_Cursor *self)
if (self->statement) {
rc = pysqlite_step(self->statement->st, self->connection);
if (PyErr_Occurred()) {
(void)pysqlite_statement_reset(self->statement);
Py_DECREF(next_row);
return NULL;
goto error;
}
if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
(void)pysqlite_statement_reset(self->statement);
Py_DECREF(next_row);
_pysqlite_seterror(self->connection->db, NULL);
return NULL;
goto error;
}

if (rc == SQLITE_ROW) {
self->locked = 1; // GH-80254: Prevent recursive use of cursors.
self->next_row = _pysqlite_fetch_one_row(self);
self->locked = 0;
if (self->next_row == NULL) {
(void)pysqlite_statement_reset(self->statement);
return NULL;
goto error;
}
}
}

return next_row;

error:
(void)pysqlite_statement_reset(self->statement);
Py_DECREF(next_row);
return NULL;
}

PyObject* pysqlite_cursor_fetchone(pysqlite_Cursor* self, PyObject* args)
Expand Down