Mercurial > cpython-lru_cache-weakref
diff Objects/object.c @ 59539:06fdc5e0c2c2
Issue #6697: catch _PyUnicode_AsString() errors in getattr() and setattr()
builtin functions.
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Fri, 12 Mar 2010 17:17:58 +0000 |
| parents | 733138858157 |
| children | 9de5630fc61b |
line wrap: on
line diff
--- a/Objects/object.c Fri Mar 12 17:00:41 2010 +0000 +++ b/Objects/object.c Fri Mar 12 17:17:58 2010 +0000 @@ -799,8 +799,12 @@ } if (tp->tp_getattro != NULL) return (*tp->tp_getattro)(v, name); - if (tp->tp_getattr != NULL) - return (*tp->tp_getattr)(v, _PyUnicode_AsString(name)); + if (tp->tp_getattr != NULL) { + char *name_str = _PyUnicode_AsString(name); + if (name_str == NULL) + return NULL; + return (*tp->tp_getattr)(v, name_str); + } PyErr_Format(PyExc_AttributeError, "'%.50s' object has no attribute '%U'", tp->tp_name, name); @@ -840,7 +844,10 @@ return err; } if (tp->tp_setattr != NULL) { - err = (*tp->tp_setattr)(v, _PyUnicode_AsString(name), value); + char *name_str = _PyUnicode_AsString(name); + if (name_str == NULL) + return -1; + err = (*tp->tp_setattr)(v, name_str, value); Py_DECREF(name); return err; } @@ -1019,8 +1026,8 @@ } PyErr_Format(PyExc_AttributeError, - "'%.50s' object has no attribute '%.400s'", - tp->tp_name, _PyUnicode_AsString(name)); + "'%.50s' object has no attribute '%U'", + tp->tp_name, name); done: Py_DECREF(name); return res;