From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 16 Mar 2012 14:32:59 +0000 (-0500)
Subject: check to make sure the attribute is a string (#14334)
X-Git-Tag: v3.3.0a2~152^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16d84ac355c532a1e7d25cf75e0b577923de2856;p=thirdparty%2FPython%2Fcpython.git

check to make sure the attribute is a string (#14334)
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 4aeb77fd0f20..141d7918ddf7 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4393,6 +4393,9 @@ order (MRO) for bases """
 
         self.assertRaises(AttributeError, getattr, EvilGetattribute(), "attr")
 
+    def test_type___getattribute__(self):
+        self.assertRaises(TypeError, type.__getattribute__, list, type)
+
     def test_abstractmethods(self):
         # type pretends not to have __abstractmethods__.
         self.assertRaises(AttributeError, getattr, type, "__abstractmethods__")
diff --git a/Misc/NEWS b/Misc/NEWS
index 772f78e97ddb..6659aadcfccc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.4
 Core and Builtins
 -----------------
 
+- Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
+  passed strings.
+
 - Issue #1469629: Allow cycles through an object's __dict__ slot to be
   collected. (For example if ``x.__dict__ is x``).
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index e00669480590..f0c787fa2a54 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2462,6 +2462,13 @@ type_getattro(PyTypeObject *type, PyObject *name)
     PyObject *meta_attribute, *attribute;
     descrgetfunc meta_get;
 
+    if (!PyUnicode_Check(name)) {
+        PyErr_Format(PyExc_TypeError,
+                     "attribute name must be string, not '%.200s'",
+                     name->ob_type->tp_name);
+        return NULL;
+    }
+
     /* Initialize this type (we'll assume the metatype is initialized) */
     if (type->tp_dict == NULL) {
         if (PyType_Ready(type) < 0)