From: Guido van Rossum <guido@python.org>
Date: Tue, 4 Dec 2001 17:13:22 +0000 (+0000)
Subject: Fix SF bug #486144: Uninitialized __slot__ vrbl is None.
X-Git-Tag: v2.2.1c1~560
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64b206c19e764d12f61681359544938c45912262;p=python

Fix SF bug #486144: Uninitialized __slot__ vrbl is None.

There's now a new structmember code, T_OBJECT_EX, which is used for
all __slot__ variables (except __weakref__, which has special behavior
anyway).  This new code raises AttributeError when the variable is
NULL rather than converting NULL to None.
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 6fc5d027bc..16591cf77f 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1059,11 +1059,13 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
 		for (i = 0; i < nslots; i++, mp++) {
 			mp->name = PyString_AS_STRING(
 				PyTuple_GET_ITEM(slots, i));
-			mp->type = T_OBJECT;
+			mp->type = T_OBJECT_EX;
 			mp->offset = slotoffset;
 			if (base->tp_weaklistoffset == 0 &&
-			    strcmp(mp->name, "__weakref__") == 0)
+			    strcmp(mp->name, "__weakref__") == 0) {
+				mp->type = T_OBJECT;
 				type->tp_weaklistoffset = slotoffset;
+			}
 			slotoffset += sizeof(PyObject *);
 		}
 	}