diff options
| -rw-r--r-- | Lib/sqlite3/test/factory.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_types.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 6 | ||||
| -rw-r--r-- | Modules/_sqlite/row.c | 2 | ||||
| -rw-r--r-- | Objects/genobject.c | 5 | ||||
| -rw-r--r-- | Objects/namespaceobject.c | 7 |
6 files changed, 36 insertions, 8 deletions
diff --git a/Lib/sqlite3/test/factory.py b/Lib/sqlite3/test/factory.py index 3d4eb0b..f587596 100644 --- a/Lib/sqlite3/test/factory.py +++ b/Lib/sqlite3/test/factory.py @@ -180,6 +180,14 @@ class RowFactoryTests(unittest.TestCase): self.assertEqual(list(reversed(row)), list(reversed(as_tuple))) self.assertIsInstance(row, Sequence) + def CheckFakeCursorClass(self): + # Issue #24257: Incorrect use of PyObject_IsInstance() caused + # segmentation fault. + class FakeCursor(str): + __class__ = sqlite.Cursor + cur = self.con.cursor(factory=FakeCursor) + self.assertRaises(TypeError, sqlite.Row, cur, ()) + def tearDown(self): self.con.close() diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index c5a35f9..ccaf414 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -1172,6 +1172,22 @@ class SimpleNamespaceTests(unittest.TestCase): self.assertEqual(ns, ns_roundtrip, pname) + def test_fake_namespace_compare(self): + # Issue #24257: Incorrect use of PyObject_IsInstance() caused + # SystemError. + class FakeSimpleNamespace(str): + __class__ = types.SimpleNamespace + self.assertFalse(types.SimpleNamespace() == FakeSimpleNamespace()) + self.assertTrue(types.SimpleNamespace() != FakeSimpleNamespace()) + with self.assertRaises(TypeError): + types.SimpleNamespace() < FakeSimpleNamespace() + with self.assertRaises(TypeError): + types.SimpleNamespace() <= FakeSimpleNamespace() + with self.assertRaises(TypeError): + types.SimpleNamespace() > FakeSimpleNamespace() + with self.assertRaises(TypeError): + types.SimpleNamespace() >= FakeSimpleNamespace() + class CoroutineTests(unittest.TestCase): def test_wrong_args(self): @@ -10,6 +10,9 @@ Release date: 2015-05-24 Core and Builtins ----------------- +- Issue #24257: Fixed system error in the comparison of faked + types.SimpleNamespace. + - Issue #22939: Fixed integer overflow in iterator object. Patch by Clement Rouault. @@ -55,6 +58,9 @@ Core and Builtins Library ------- +- Issue #24257: Fixed segmentation fault in sqlite3.Row constructor with faked + cursor type. + - Issue #15836: assertRaises(), assertRaisesRegex(), assertWarns() and assertWarnsRegex() assertments now check the type of the first argument to prevent possible user error. Based on patch by Daniel Wagner-Hall. diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c index d863643..07584e3 100644 --- a/Modules/_sqlite/row.c +++ b/Modules/_sqlite/row.c @@ -46,7 +46,7 @@ pysqlite_row_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) if (!PyArg_ParseTuple(args, "OO", &cursor, &data)) return NULL; - if (!PyObject_IsInstance((PyObject*)cursor, (PyObject*)&pysqlite_CursorType)) { + if (!PyObject_TypeCheck((PyObject*)cursor, &pysqlite_CursorType)) { PyErr_SetString(PyExc_TypeError, "instance of cursor required for first argument"); return NULL; } diff --git a/Objects/genobject.c b/Objects/genobject.c index 3c32e7b..555e4fd 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -442,8 +442,7 @@ _PyGen_FetchStopIterationValue(PyObject **pvalue) { PyErr_Fetch(&et, &ev, &tb); if (ev) { /* exception will usually be normalised already */ - if (Py_TYPE(ev) == (PyTypeObject *) et - || PyObject_IsInstance(ev, PyExc_StopIteration)) { + if (PyObject_TypeCheck(ev, (PyTypeObject *) et)) { value = ((PyStopIterationObject *)ev)->value; Py_INCREF(value); Py_DECREF(ev); @@ -453,7 +452,7 @@ _PyGen_FetchStopIterationValue(PyObject **pvalue) { } else { /* normalisation required */ PyErr_NormalizeException(&et, &ev, &tb); - if (!PyObject_IsInstance(ev, PyExc_StopIteration)) { + if (!PyObject_TypeCheck(ev, (PyTypeObject *)PyExc_StopIteration)) { PyErr_Restore(et, ev, tb); return -1; } diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c index 720ac0d..3d27a95 100644 --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -164,12 +164,11 @@ namespace_clear(_PyNamespaceObject *ns) static PyObject * namespace_richcompare(PyObject *self, PyObject *other, int op) { - if (PyObject_IsInstance(self, (PyObject *)&_PyNamespace_Type) && - PyObject_IsInstance(other, (PyObject *)&_PyNamespace_Type)) + if (PyObject_TypeCheck(self, &_PyNamespace_Type) && + PyObject_TypeCheck(other, &_PyNamespace_Type)) return PyObject_RichCompare(((_PyNamespaceObject *)self)->ns_dict, ((_PyNamespaceObject *)other)->ns_dict, op); - Py_INCREF(Py_NotImplemented); - return Py_NotImplemented; + Py_RETURN_NOTIMPLEMENTED; } |