Mercurial > cpython-lru_cache-weakref
diff Python/ceval.c @ 50112:abf815b80b5d
Merged revisions 67666,67685 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67666 | jeffrey.yasskin | 2008-12-08 10:55:24 -0800 (Mon, 08 Dec 2008) | 3 lines
Issue 4597: Fix several cases in EvalFrameEx where an exception could be
"raised" without setting x, err, or why to let the eval loop know.
........
r67685 | jeffrey.yasskin | 2008-12-09 23:35:02 -0800 (Tue, 09 Dec 2008) | 2 lines
Update Misc/NEWS for r67666.
........
| author | Jeffrey Yasskin <jyasskin@gmail.com> |
|---|---|
| date | Thu, 11 Dec 2008 06:18:33 +0000 |
| parents | 48239f6209b0 |
| children | 2ee4653927f7 |
line wrap: on
line diff
--- a/Python/ceval.c Thu Dec 11 04:20:07 2008 +0000 +++ b/Python/ceval.c Thu Dec 11 06:18:33 2008 +0000 @@ -1120,6 +1120,7 @@ } Py_FatalError("invalid argument to DUP_TOPX" " (bytecode corruption?)"); + /* Never returns, so don't bother to set why. */ break; case UNARY_POSITIVE: @@ -1736,6 +1737,7 @@ if ((v = f->f_locals) == NULL) { PyErr_Format(PyExc_SystemError, "no locals when loading %R", w); + why = WHY_EXCEPTION; break; } if (PyDict_CheckExact(v)) { @@ -2287,7 +2289,10 @@ if (x != NULL && opcode == MAKE_CLOSURE) { v = POP(); - err = PyFunction_SetClosure(x, v); + if (PyFunction_SetClosure(x, v) != 0) { + /* Can't happen unless bytecode is corrupt. */ + why = WHY_EXCEPTION; + } Py_DECREF(v); } @@ -2311,7 +2316,11 @@ Py_DECREF(w); } - err = PyFunction_SetAnnotations(x, v); + if (PyFunction_SetAnnotations(x, v) != 0) { + /* Can't happen unless + PyFunction_SetAnnotations changes. */ + why = WHY_EXCEPTION; + } Py_DECREF(v); Py_DECREF(u); } @@ -2328,7 +2337,11 @@ w = POP(); PyTuple_SET_ITEM(v, posdefaults, w); } - err = PyFunction_SetDefaults(x, v); + if (PyFunction_SetDefaults(x, v) != 0) { + /* Can't happen unless + PyFunction_SetDefaults changes. */ + why = WHY_EXCEPTION; + } Py_DECREF(v); } if (x != NULL && kwdefaults > 0) { @@ -2346,7 +2359,11 @@ Py_DECREF(w); Py_DECREF(u); } - err = PyFunction_SetKwDefaults(x, v); + if (PyFunction_SetKwDefaults(x, v) != 0) { + /* Can't happen unless + PyFunction_SetKwDefaults changes. */ + why = WHY_EXCEPTION; + } Py_DECREF(v); } PUSH(x);