[Python-checkins] [2.7] bpo-38175: Fix a memory leak in comparison of sqlite3.Row objects. (GH-16155). (GH-16215)

Tue Sep 17 02:56:31 EDT 2019

https://github.com/python/cpython/commit/be257bcad12b1d72a2c2a8199d2291ae22bccf78
commit: be257bcad12b1d72a2c2a8199d2291ae22bccf78
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019年09月17日T09:56:27+03:00
summary:
[2.7] bpo-38175: Fix a memory leak in comparison of sqlite3.Row objects. (GH-16155). (GH-16215)
(cherry picked from commit 8debfa50407107ff2329d01081cdc12d359f1d12)
files:
A Misc/NEWS.d/next/Library/2019-09-15-10-30-33.bpo-38175.61XlUv.rst
M Lib/sqlite3/test/factory.py
M Modules/_sqlite/row.c

diff --git a/Lib/sqlite3/test/factory.py b/Lib/sqlite3/test/factory.py
index b9e9cd7fd7f4..b8e0f645a00e 100644
--- a/Lib/sqlite3/test/factory.py
+++ b/Lib/sqlite3/test/factory.py
@@ -159,19 +159,24 @@ def CheckSqliteRowHashCmp(self):
 row_1 = self.con.execute("select 1 as a, 2 as b").fetchone()
 row_2 = self.con.execute("select 1 as a, 2 as b").fetchone()
 row_3 = self.con.execute("select 1 as a, 3 as b").fetchone()
+ row_4 = self.con.execute("select 1 as b, 2 as a").fetchone()
+ row_5 = self.con.execute("select 2 as b, 1 as a").fetchone()
 
- self.assertEqual(row_1, row_1)
- self.assertEqual(row_1, row_2)
- self.assertTrue(row_2 != row_3)
+ self.assertTrue(row_1 == row_1)
+ self.assertTrue(row_1 == row_2)
+ self.assertFalse(row_1 == row_3)
+ self.assertFalse(row_1 == row_4)
+ self.assertFalse(row_1 == row_5)
+ self.assertFalse(row_1 == object())
 
 self.assertFalse(row_1 != row_1)
 self.assertFalse(row_1 != row_2)
- self.assertFalse(row_2 == row_3)
+ self.assertTrue(row_1 != row_3)
+ self.assertTrue(row_1 != row_4)
+ self.assertTrue(row_1 != row_5)
+ self.assertTrue(row_1 != object())
 
- self.assertEqual(row_1, row_2)
 self.assertEqual(hash(row_1), hash(row_2))
- self.assertNotEqual(row_1, row_3)
- self.assertNotEqual(hash(row_1), hash(row_3))
 
 def CheckSqliteRowAsSequence(self):
 """ Checks if the row object can act like a sequence """
diff --git a/Misc/NEWS.d/next/Library/2019-09-15-10-30-33.bpo-38175.61XlUv.rst b/Misc/NEWS.d/next/Library/2019-09-15-10-30-33.bpo-38175.61XlUv.rst
new file mode 100644
index 000000000000..6d9f280bbd05
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-09-15-10-30-33.bpo-38175.61XlUv.rst
@@ -0,0 +1 @@
+Fix a memory leak in comparison of :class:`sqlite3.Row` objects.
diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c
index 9ebe7b7b81fb..c0da329c13eb 100644
--- a/Modules/_sqlite/row.c
+++ b/Modules/_sqlite/row.c
@@ -199,14 +199,16 @@ static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other,
 Py_INCREF(Py_NotImplemented);
 return Py_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_INCREF(Py_NotImplemented);
 return Py_NotImplemented;
