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.
........

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index f88a2d5d1380e8e0940bcb629d2ea0038d049203..34c2bb18a8b8cefb6c9492cbedb79f61b5e9de7b 100644 (file)
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -495,6 +495,8 @@ class BuiltinTest(unittest.TestCase):
         self.assertRaises(TypeError, getattr, sys, 1, "foo")
         self.assertRaises(TypeError, getattr)
         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):
         import sys

diff --git a/Objects/object.c b/Objects/object.c
index 3a6db18b2de00ca26d6ed914c1edb25855275882..eba061ba09386e2db4649ab8367196a54e8b5dc6 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -797,8 +797,12 @@ PyObject_GetAttr(PyObject *v, PyObject *name)
        }
        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);
@@ -838,7 +842,10 @@ PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value)
                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;
        }
@@ -1017,8 +1024,8 @@ PyObject_GenericGetAttr(PyObject *obj, PyObject *name)
        }
 
        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;