mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Don't stomp on an exception set by PyCell_Get()

Browse source
This commit is contained in:
Jeremy Hylton 2002-07-11 16:56:38 +00:00
parent 7b4c8e485c
commit 76c81eecfa
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Python/ceval.c
View file

@ -1734,6 +1734,10 @@ eval_frame(PyFrameObject *f)
x = freevars[oparg]; x = freevars[oparg];
w = PyCell_Get(x); w = PyCell_Get(x);
if (w == NULL) { if (w == NULL) {
err = -1;
/* Don't stomp existing exception */
if (PyErr_Occurred())
break;
if (oparg < f->f_ncells) { if (oparg < f->f_ncells) {
v = PyTuple_GetItem(co->co_cellvars, v = PyTuple_GetItem(co->co_cellvars,
oparg); oparg);
@ -1750,7 +1754,6 @@ eval_frame(PyFrameObject *f)
UNBOUNDFREE_ERROR_MSG, UNBOUNDFREE_ERROR_MSG,
v); v);
} }
err = -1;
break; break;
} }
PUSH(w); PUSH(w);