diff options
| author | Michael W. Hudson <mwh@python.net> | 2003-08-15 13:07:47 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2003-08-15 13:07:47 (GMT) |
| commit | b2c7de46673e654aec8d2c9b000cce2b071a5093 (patch) | |
| tree | 9f70390e3c74935ed99f0fa1090435d82bf5d47c /Objects/object.c | |
| parent | f02bcee095bf0343b9871fd28cf2d580337c599a (diff) | |
| download | cpython-b2c7de46673e654aec8d2c9b000cce2b071a5093.zip cpython-b2c7de46673e654aec8d2c9b000cce2b071a5093.tar.gz cpython-b2c7de46673e654aec8d2c9b000cce2b071a5093.tar.bz2 | |
Fix for
[ 784825 ] fix obscure crash in descriptor handling
Should be applied to release23-maint and in all likelyhood
release22-maint, too.
Certainly doesn't apply to release21-maint.
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Objects/object.c b/Objects/object.c index 93057c0..8c4bd0e 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1412,12 +1412,15 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name) } } + Py_XINCREF(descr); + f = NULL; if (descr != NULL && PyType_HasFeature(descr->ob_type, Py_TPFLAGS_HAVE_CLASS)) { f = descr->ob_type->tp_descr_get; if (f != NULL && PyDescr_IsData(descr)) { res = f(descr, obj, (PyObject *)obj->ob_type); + Py_DECREF(descr); goto done; } } @@ -1445,6 +1448,7 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name) res = PyDict_GetItem(dict, name); if (res != NULL) { Py_INCREF(res); + Py_XDECREF(descr); goto done; } } @@ -1452,12 +1456,13 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name) if (f != NULL) { res = f(descr, obj, (PyObject *)obj->ob_type); + Py_DECREF(descr); goto done; } if (descr != NULL) { - Py_INCREF(descr); res = descr; + /* descr was already increfed above */ goto done; } |