diff options
| author | Armin Rigo <arigo@tunes.org> | 2004-10-28 16:32:00 +0000 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2004-10-28 16:32:00 +0000 |
| commit | e0962fc1c68294f36200f849d1fe6e509c211ca2 (patch) | |
| tree | fc9a2ee7726154a27872a254a103a23cd466a444 /Objects/funcobject.c | |
| parent | 81c24608179bd058dfbfa3736e3b5deb01bf6432 (diff) | |
| download | cpython-e0962fc1c68294f36200f849d1fe6e509c211ca2.tar.gz | |
Wrote down the invariants of some common objects whose structure is
exposed in header files. Fixed a few comments in these headers.
As we might have expected, writing down invariants systematically exposed a
(minor) bug. In this case, function objects have a writeable func_code
attribute, which could be set to code objects with the wrong number of
free variables. Calling the resulting function segfaulted the interpreter.
Added a corresponding test.
Diffstat (limited to 'Objects/funcobject.c')
| -rw-r--r-- | Objects/funcobject.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Objects/funcobject.c b/Objects/funcobject.c index c46887c96b..c7f7c9d23d 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -230,6 +230,7 @@ static int func_set_code(PyFunctionObject *op, PyObject *value) { PyObject *tmp; + int nfree, nclosure; if (restricted()) return -1; @@ -240,6 +241,17 @@ func_set_code(PyFunctionObject *op, PyObject *value) "func_code must be set to a code object"); return -1; } + nfree = PyCode_GetNumFree((PyCodeObject *)value); + nclosure = (op->func_closure == NULL ? 0 : + PyTuple_GET_SIZE(op->func_closure)); + if (nclosure != nfree) { + PyErr_Format(PyExc_ValueError, + "%s() requires a code object with %d free vars," + " not %d", + PyString_AsString(op->func_name), + nclosure, nfree); + return -1; + } tmp = op->func_code; Py_INCREF(value); op->func_code = value; |