Skip to content

gh-94028: Clear and reset sqlite3 statements properly in cursor iternext (GH-94042) #94042

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
pablogsal merged 6 commits into from
Jun 21, 2022
+45 −0
Merged

gh-94028: Clear and reset sqlite3 statements properly in cursor iternext (GH-94042) #94042

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
239ead3
gh-94028: Clear and reset sqlite3 statements properly in cursor iternext
erlend-aasland Jun 20, 2022
5c59655
Add NEWS
erlend-aasland Jun 20, 2022
f08c504
Update 2022-06-20-23-14-43.gh-issue-94028.UofEcX.rst
Jun 20, 2022
ae7c896
Add issue repro as test
erlend-aasland Jun 20, 2022
4e4b4da
Update 2022-06-20-23-14-43.gh-issue-94028.UofEcX.rst
Jun 20, 2022
b863001
Merge remote-tracking branch 'origin/sqlite-fix-release-blocker' into…
erlend-aasland Jun 20, 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
Next Next commit
gh-94028: Clear and reset sqlite3 statements properly in cursor iternext
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jun 20, 2022
commit 239ead3de23e39b869f460acf20fb5c112ffb749
3 changes: 3 additions & 0 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,10 +1129,13 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
self->rowcount = (long)sqlite3_changes(self->connection->db);
}
(void)stmt_reset(self->statement);
Py_CLEAR(self->statement);
}
else if (rc != SQLITE_ROW) {
(void)_pysqlite_seterror(self->connection->state,
self->connection->db);
(void)stmt_reset(self->statement);
Py_CLEAR(self->statement);
Py_DECREF(row);
return NULL;
}
Expand Down