diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-09-17 06:14:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 06:14:30 (GMT) |
commit | 4ac1be28281d8961e71b13623c3671245c125760 (patch) | |
tree | 8460645a9b4fd3a764b979072be98dc973a294d0 /Modules/_sqlite/row.c | |
parent | 89f132a3286640b764a69b8945cbb3a499ad6bab (diff) | |
download | cpython-4ac1be28281d8961e71b13623c3671245c125760.zip cpython-4ac1be28281d8961e71b13623c3671245c125760.tar.gz cpython-4ac1be28281d8961e71b13623c3671245c125760.tar.bz2 |
bpo-38175: Fix a memory leak in comparison of sqlite3.Row objects. (GH-16155)
(cherry picked from commit 8debfa50407107ff2329d01081cdc12d359f1d12)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Modules/_sqlite/row.c')
-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 122bee0..0edc69f 100644 --- a/Modules/_sqlite/row.c +++ b/Modules/_sqlite/row.c @@ -197,14 +197,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; } |