diff options
| author | Guido van Rossum <guido@python.org> | 2001-12-04 16:23:42 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2001-12-04 16:23:42 +0000 |
| commit | 57a7ea806e817d27e2e7a473adfe6bbead4e907c (patch) | |
| tree | 96ff2f173a294accf640300ad05963cd5360c7d1 /Python/structmember.c | |
| parent | 255a8997d629c36e2c82199cbdffea5549c927e7 (diff) | |
| download | cpython-57a7ea806e817d27e2e7a473adfe6bbead4e907c.tar.gz | |
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.
Diffstat (limited to 'Python/structmember.c')
| -rw-r--r-- | Python/structmember.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Python/structmember.c b/Python/structmember.c index aa0ea9fe59..34310b8979 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -129,6 +129,12 @@ PyMember_GetOne(char *addr, PyMemberDef *l) v = Py_None; Py_INCREF(v); break; + case T_OBJECT_EX: + v = *(PyObject **)addr; + if (v == NULL) + PyErr_SetString(PyExc_AttributeError, l->name); + Py_XINCREF(v); + break; default: PyErr_SetString(PyExc_SystemError, "bad memberdescr type"); v = NULL; @@ -175,7 +181,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) PyErr_SetString(PyExc_RuntimeError, "restricted attribute"); return -1; } - if (v == NULL && l->type != T_OBJECT) { + if (v == NULL && l->type != T_OBJECT_EX && l->type != T_OBJECT) { PyErr_SetString(PyExc_TypeError, "can't delete numeric/char attribute"); return -1; @@ -246,6 +252,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v) } break; case T_OBJECT: + case T_OBJECT_EX: Py_XINCREF(v); oldv = *(PyObject **)addr; *(PyObject **)addr = v; |