Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix for Issue2515: Don't crash when trying to fetch data from a closed cursor.

This commit is contained in:
Gerhard Häring 2008-04-06 11:05:24 +00:00
parent f122902f76
commit a269762fb0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/_sqlite/cursor.c
View File

@ -851,15 +851,17 @@ PyObject* cursor_iternext(Cursor *self)
next_row = next_row_tuple;
}
rc = _sqlite_step_with_busyhandler(self->statement->st, self->connection);
if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
Py_DECREF(next_row);
_seterror(self->connection->db);
return NULL;
}
if (self->statement) {
rc = _sqlite_step_with_busyhandler(self->statement->st, self->connection);
if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
Py_DECREF(next_row);
_seterror(self->connection->db);
return NULL;
}
if (rc == SQLITE_ROW) {
self->next_row = _fetch_one_row(self);
if (rc == SQLITE_ROW) {
self->next_row = _fetch_one_row(self);
}
}
return next_row;