merge 3.2 (#14334)
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index f405fbb..bf82a88 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4400,6 +4400,9 @@
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 7843459..470ab42 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
- Give the ast.AST class a __dict__.
+- 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 4487322..db0b042 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2486,6 +2486,13 @@
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)