| commit | 76c81eecfa0b2a8a8a62a593ac2bd8c3e6c79acd | [log] [tgz] |
|---|---|---|
| author | Jeremy Hylton <jeremy@alum.mit.edu> | Thu Jul 11 16:56:38 2002 +0000 |
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | Thu Jul 11 16:56:38 2002 +0000 |
| tree | 06691a87857a4faecb927df1510abfb9b1da9e18 | |
| parent | 7b4c8e485c6ec3cc4605b6e1a24bd3a324f1c0a5 [diff] [blame] |
Don't stomp on an exception set by PyCell_Get()
diff --git a/Python/ceval.c b/Python/ceval.c index 7f7d37e..61db642 100644 --- a/Python/ceval.c +++ b/Python/ceval.c
@@ -1734,6 +1734,10 @@ x = freevars[oparg]; w = PyCell_Get(x); if (w == NULL) { + err = -1; + /* Don't stomp existing exception */ + if (PyErr_Occurred()) + break; if (oparg < f->f_ncells) { v = PyTuple_GetItem(co->co_cellvars, oparg); @@ -1750,7 +1754,6 @@ UNBOUNDFREE_ERROR_MSG, v); } - err = -1; break; } PUSH(w);