mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-129603: Don't segfault if sqlite3.Row description is None (#129604)

Browse source
This commit is contained in:
Erlend E. Aasland 2025-02-10 00:27:28 +01:00 • committed by GitHub
parent d05053a203
commit 7e6ee50b6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 83 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Modules/_sqlite/row.c
View file

@ -138,7 +138,6 @@ static PyObject *
pysqlite_row_subscript(PyObject *op, PyObject *idx)
{
Py_ssize_t _idx;
Py_ssize_t nitems, i;
pysqlite_Row *self = _pysqlite_Row_CAST(op);
if (PyLong_Check(idx)) {
@ -151,9 +150,13 @@ pysqlite_row_subscript(PyObject *op, PyObject *idx)
PyObject *item = PyTuple_GetItem(self->data, _idx);
return Py_XNewRef(item);
} else if (PyUnicode_Check(idx)) {
nitems = PyTuple_Size(self->description);
if (Py_IsNone(self->description)) {
PyErr_Format(PyExc_IndexError, "No item with key %R", idx);
return NULL;
}
Py_ssize_t nitems = PyTuple_GET_SIZE(self->description);
for (i = 0; i < nitems; i++) {
for (Py_ssize_t i = 0; i < nitems; i++) {
PyObject *obj;
obj = PyTuple_GET_ITEM(self->description, i);
obj = PyTuple_GET_ITEM(obj, 0);
@ -197,17 +200,19 @@ static PyObject *
pysqlite_row_keys_impl(pysqlite_Row *self)
/*[clinic end generated code: output=efe3dfb3af6edc07 input=7549a122827c5563]*/
{
PyObject* list;
Py_ssize_t nitems, i;
list = PyList_New(0);
PyObject *list = PyList_New(0);
if (!list) {
return NULL;
}
nitems = PyTuple_Size(self->description);
if (Py_IsNone(self->description)) {
return list;
}
for (i = 0; i < nitems; i++) {
if (PyList_Append(list, PyTuple_GET_ITEM(PyTuple_GET_ITEM(self->description, i), 0)) != 0) {
Py_ssize_t nitems = PyTuple_GET_SIZE(self->description);
for (Py_ssize_t i = 0; i < nitems; i++) {
PyObject *descr = PyTuple_GET_ITEM(self->description, i);
PyObject *name = PyTuple_GET_ITEM(descr, 0);
if (PyList_Append(list, name) < 0) {
Py_DECREF(list);
return NULL;
}