diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2019-09-16 17:15:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 17:15:18 (GMT) |
| commit | 8debfa50407107ff2329d01081cdc12d359f1d12 (patch) | |
| tree | 37668c95d2aad9ac11e6c9a97a2b0cccce3526b8 /Modules/_sqlite | |
| parent | a9187c31185fe7ea47271839898416400cc3d976 (diff) | |
| download | cpython-8debfa50407107ff2329d01081cdc12d359f1d12.zip cpython-8debfa50407107ff2329d01081cdc12d359f1d12.tar.gz cpython-8debfa50407107ff2329d01081cdc12d359f1d12.tar.bz2 | |
bpo-38175: Fix a memory leak in comparison of sqlite3.Row objects. (GH-16155)
Diffstat (limited to 'Modules/_sqlite')
| -rw-r--r-- | Modules/_sqlite/row.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c index 5c2f400..758518a 100644 --- a/Modules/_sqlite/row.c +++ b/Modules/_sqlite/row.c @@ -192,14 +192,16 @@ static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other, if (opid != Py_EQ && opid != Py_NE) Py_RETURN_NOTIMPLEMENTED; - if (PyType_IsSubtype(Py_TYPE(_other), &pysqlite_RowType)) { + if (PyObject_TypeCheck(_other, &pysqlite_RowType)) { pysqlite_Row *other = (pysqlite_Row *)_other; - PyObject *res = PyObject_RichCompare(self->description, other->description, opid); - if ((opid == Py_EQ && res == Py_True) - || (opid == Py_NE && res == Py_False)) { - Py_DECREF(res); + int eq = PyObject_RichCompareBool(self->description, other->description, Py_EQ); + if (eq < 0) { + return NULL; + } + if (eq) { return PyObject_RichCompare(self->data, other->data, opid); } + return PyBool_FromLong(opid != Py_EQ); } Py_RETURN_NOTIMPLEMENTED; } |