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

Issue #24257: Fixed incorrect uses of PyObject_IsInstance().

Browse source 
Fixed segmentation fault in sqlite3.Row constructor with faked cursor type.
Fixed system error in the comparison of faked types.SimpleNamespace.
This commit is contained in:
Serhiy Storchaka 2015-05-22 11:02:49 +03:00
parent df9ba3623a
commit 08d230a540
6 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Objects/genobject.c
View file

@ -398,8 +398,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);
@ -409,7 +408,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;
}

7
Objects/namespaceobject.c
View file

@ -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;
}