From: Guido van Rossum <guido@python.org>
Date: Thu, 30 Aug 2001 04:43:35 +0000 (+0000)
Subject: Safety measures now that str and tuple are subclassable:
X-Git-Tag: v2.2a3~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c41418751fcef0a42f336ba91871827b45d558a7;p=thirdparty%2FPython%2Fcpython.git

Safety measures now that str and tuple are subclassable:

If tp_itemsize of the basetype is nonzero, only allow empty __slots__
(declaring that no __dict__ should be added), and don't add a weakref
offset.
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 559c41b6e82b..719a0a4021e6 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -712,6 +712,13 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
 		if (slots == NULL)
 			return NULL;
 		nslots = PyTuple_GET_SIZE(slots);
+		if (nslots > 0 && base->tp_itemsize != 0) {
+			PyErr_Format(PyExc_TypeError,
+				     "nonempty __slots__ "
+				     "not supported for subtype of '%s'",
+				     base->tp_name);
+			return NULL;
+		}
 		for (i = 0; i < nslots; i++) {
 			if (!PyString_Check(PyTuple_GET_ITEM(slots, i))) {
 				PyErr_SetString(PyExc_TypeError,
@@ -728,7 +735,8 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
 		nslots++;
 		add_dict++;
 	}
-	if (slots == NULL && base->tp_weaklistoffset == 0) {
+	if (slots == NULL && base->tp_weaklistoffset == 0 &&
+	    base->tp_itemsize == 0) {
 		nslots++;
 		add_weak++;
 	}