traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 78876 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78876 | victor.stinner | 2010-03-12 18:17:58 +0100 (ven., 12 mars 2010) | 3 lines

  Issue #6697: catch _PyUnicode_AsString() errors in getattr() and setattr()
  builtin functions.
........
This commit is contained in:
Victor Stinner 2010-03-21 21:07:44 +00:00
parent 38c36f8576
commit 7f045cfba3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_builtin.py
View File

@ -495,6 +495,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

@ -797,8 +797,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);
@ -838,7 +842,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;
} }
@ -1017,8 +1024,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;