diff options
| author |   Serhiy Storchaka <storchaka@gmail.com> | 2021-01-31 17:42:38 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-01-31 17:42:38 +0200 |
| commit | 9073180db521dc83e6216ff0da1479d00167f643 (patch) | |
| tree | 61a0cf80eb0cf228a6c6e134bc90874a7e4a8030 | |
| parent | bpo-43016: Rewrite tests for curses (GH-24312) (diff) | |
| download | cpython-9073180db521dc83e6216ff0da1479d00167f643.tar.gz cpython-9073180db521dc83e6216ff0da1479d00167f643.tar.bz2 cpython-9073180db521dc83e6216ff0da1479d00167f643.zip | |
bpo-43083: Fix error handling in _sqlite3 (GH-24395)
| -rw-r--r-- | Modules/_sqlite/connection.c | 6 | ||||
| -rw-r--r-- | Modules/_sqlite/cursor.c | 20 |
2 files changed, 19 insertions, 7 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index dbe5dd1ec13..370dc1a30e4 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -1772,7 +1772,11 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self, (callable != Py_None) ? callable : NULL, (callable != Py_None) ? pysqlite_collation_callback : NULL); if (rc != SQLITE_OK) { - PyDict_DelItem(self->collations, uppercase_name); + if (callable != Py_None) { + if (PyDict_DelItem(self->collations, uppercase_name) < 0) { + PyErr_Clear(); + } + } _pysqlite_seterror(self->db, NULL); goto finally; } diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 0852aa94026..f8fe11ed1ea 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -567,11 +567,13 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation } if (!multiple) { - Py_DECREF(self->lastrowid); Py_BEGIN_ALLOW_THREADS lastrowid = sqlite3_last_insert_rowid(self->connection->db); Py_END_ALLOW_THREADS - self->lastrowid = PyLong_FromLongLong(lastrowid); + Py_SETREF(self->lastrowid, PyLong_FromLongLong(lastrowid)); + if (self->lastrowid == NULL) { + goto error; + } } if (rc == SQLITE_ROW) { @@ -842,8 +844,11 @@ pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows) } while ((row = pysqlite_cursor_iternext(self))) { - PyList_Append(list, row); - Py_XDECREF(row); + if (PyList_Append(list, row) < 0) { + Py_DECREF(row); + break; + } + Py_DECREF(row); if (++counter == maxrows) { break; @@ -877,8 +882,11 @@ pysqlite_cursor_fetchall_impl(pysqlite_Cursor *self) } while ((row = pysqlite_cursor_iternext(self))) { - PyList_Append(list, row); - Py_XDECREF(row); + if (PyList_Append(list, row) < 0) { + Py_DECREF(row); + break; + } + Py_DECREF(row); } if (PyErr_Occurred()) { |