mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #6697: catch _PyUnicode_AsString() errors in getattr() and setattr()

Browse source 
builtin functions.
This commit is contained in:
Victor Stinner 2010-03-12 17:17:58 +00:00
parent 3f1af5c42e
commit 624dbf6220
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_builtin.py
View file

@ -479,6 +479,8 @@ class BuiltinTest(unittest.TestCase):
self.assertRaises(TypeError, getattr, sys, 1, "foo") self.assertRaises(TypeError, getattr, sys, 1, "foo")
self.assertRaises(TypeError, getattr) self.assertRaises(TypeError, getattr)
self.assertRaises(AttributeError, getattr, sys, chr(sys.maxunicode)) self.assertRaises(AttributeError, getattr, sys, chr(sys.maxunicode))
# unicode surrogates are not encodable to the default encoding (utf8)
self.assertRaises(AttributeError, getattr, 1, "\uDAD1\uD51E")
def test_hasattr(self): def test_hasattr(self):
import sys import sys

17
Objects/object.c
View file

@ -799,8 +799,12 @@ PyObject_GetAttr(PyObject *v, PyObject *name)
} }
if (tp->tp_getattro != NULL) if (tp->tp_getattro != NULL)
return (*tp->tp_getattro)(v, name); return (*tp->tp_getattro)(v, name);
if (tp->tp_getattr != NULL) if (tp->tp_getattr != NULL) {
return (*tp->tp_getattr)(v, _PyUnicode_AsString(name)); char *name_str = _PyUnicode_AsString(name);
if (name_str == NULL)
return NULL;
return (*tp->tp_getattr)(v, name_str);
}
PyErr_Format(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"'%.50s' object has no attribute '%U'", "'%.50s' object has no attribute '%U'",
tp->tp_name, name); tp->tp_name, name);
@ -840,7 +844,10 @@ PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value)
return err; return err;
} }
if (tp->tp_setattr != NULL) { 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); Py_DECREF(name);
return err; return err;
} }
@ -1019,8 +1026,8 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name)
} }
PyErr_Format(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"'%.50s' object has no attribute '%.400s'", "'%.50s' object has no attribute '%U'",
tp->tp_name, _PyUnicode_AsString(name)); tp->tp_name, name);
done: done:
Py_DECREF(name); Py_DECREF(name);
return res; return res;