commit ec862b907aff99a4f256b946764f349f4d1d0c5c
author Armin Rigo <arigo@tunes.org> Sat Sep 24 22:58:41 2005 +0000
committer Armin Rigo <arigo@tunes.org> Sat Sep 24 22:58:41 2005 +0000
tree 27fc76933fa062bf8df463f2f3382204faa59a6f
parent 6b27cda64386195cd07dfb686e9486f1c4bc3159

(pedronis, arigo)
segfault when a class contain a non-list value in the (undocumented)
special attribute __slotnames__.

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 41488a4..88c4a15 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2522,7 +2522,7 @@
 
 	clsdict = ((PyTypeObject *)cls)->tp_dict;
 	slotnames = PyDict_GetItemString(clsdict, "__slotnames__");
-	if (slotnames != NULL) {
+	if (slotnames != NULL && PyList_Check(slotnames)) {
 		Py_INCREF(slotnames);
 		return slotnames;
 	}