diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-06-11 04:18:53 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-06-11 04:18:53 (GMT) |
| commit | 76d3f14e01ed4096fa39cd99262690fd050efcf0 (patch) | |
| tree | 5670845896c2297666de0c1bcfde855a57dbba14 /Modules | |
| parent | 59895111836a9aa36ccd519c8f44faa5abf87b8e (diff) | |
| download | cpython-76d3f14e01ed4096fa39cd99262690fd050efcf0.zip cpython-76d3f14e01ed4096fa39cd99262690fd050efcf0.tar.gz cpython-76d3f14e01ed4096fa39cd99262690fd050efcf0.tar.bz2 | |
PyErr_NormalizeException doesn't like being called with an exception set
(issues #21677, #21310).
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_io/_iomodule.c | 8 | ||||
| -rw-r--r-- | Modules/_io/bufferedio.c | 8 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 1dbd563..660ff1f 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -470,14 +470,14 @@ io_open(PyObject *self, PyObject *args, PyObject *kwds) if (_PyObject_CallMethodId(result, &PyId_close, NULL) != NULL) PyErr_Restore(exc, val, tb); else { - PyObject *val2; + PyObject *exc2, *val2, *tb2; + PyErr_Fetch(&exc2, &val2, &tb2); PyErr_NormalizeException(&exc, &val, &tb); Py_XDECREF(exc); Py_XDECREF(tb); - PyErr_Fetch(&exc, &val2, &tb); - PyErr_NormalizeException(&exc, &val2, &tb); + PyErr_NormalizeException(&exc2, &val2, &tb2); PyException_SetContext(val2, val); - PyErr_Restore(exc, val2, tb); + PyErr_Restore(exc2, val2, tb2); } Py_DECREF(result); } diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index d0e92e5..4c0262e 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -548,14 +548,14 @@ buffered_close(buffered *self, PyObject *args) PyErr_Restore(exc, val, tb); } else { - PyObject *val2; + PyObject *exc2, *val2, *tb2; + PyErr_Fetch(&exc2, &val2, &tb2); PyErr_NormalizeException(&exc, &val, &tb); Py_DECREF(exc); Py_XDECREF(tb); - PyErr_Fetch(&exc, &val2, &tb); - PyErr_NormalizeException(&exc, &val2, &tb); + PyErr_NormalizeException(&exc2, &val2, &tb2); PyException_SetContext(val2, val); - PyErr_Restore(exc, val2, tb); + PyErr_Restore(exc2, val2, tb2); } } diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 55392b4..635093e 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -2613,14 +2613,14 @@ textiowrapper_close(textio *self, PyObject *args) PyErr_Restore(exc, val, tb); } else { - PyObject *val2; + PyObject *exc2, *val2, *tb2; + PyErr_Fetch(&exc2, &val2, &tb2); PyErr_NormalizeException(&exc, &val, &tb); Py_DECREF(exc); Py_XDECREF(tb); - PyErr_Fetch(&exc, &val2, &tb); - PyErr_NormalizeException(&exc, &val2, &tb); + PyErr_NormalizeException(&exc2, &val2, &tb2); PyException_SetContext(val2, val); - PyErr_Restore(exc, val2, tb); + PyErr_Restore(exc2, val2, tb2); } } return res; |