Issue #19437: Fix pysqlite_cursor_iternext() of sqlite3, handle

vstinner · vstinner · commit dd4b299df158 · 2013-11-05T14:30:11.000+01:00
_pysqlite_fetch_one_row() failure
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -891,6 +891,12 @@ PyObject* pysqlite_cursor_iternext(pysqlite_Cursor *self)
 
         if (rc == SQLITE_ROW) {
             self->next_row = _pysqlite_fetch_one_row(self);
+            if (self->next_row == NULL) {
+                (void)pysqlite_statement_reset(self->statement);
+                Py_DECREF(next_row);
+                _pysqlite_seterror(self->connection->db, NULL);
+                return NULL;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -891,6 +891,12 @@ PyObject* pysqlite_cursor_iternext(pysqlite_Cursor *self)`
`891`	`891`
`892`	`892`	`if (rc == SQLITE_ROW) {`
`893`	`893`	`self->next_row = _pysqlite_fetch_one_row(self);`
	`894`	`+ if (self->next_row == NULL) {`
	`895`	`+ (void)pysqlite_statement_reset(self->statement);`
	`896`	`+ Py_DECREF(next_row);`
	`897`	`+ _pysqlite_seterror(self->connection->db, NULL);`
	`898`	`+ return NULL;`
	`899`	`+ }`
`894`	`900`	`}`
`895`	`901`	`}`
`896`	`902`