traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #20024: Py_BuildValue() now saves/restores the current exception before 

building an item if the build of a previous item failed.
This commit is contained in:
Victor Stinner 2014-01-21 20:52:17 +01:00
parent 5116f78221
commit 2d854c8e7b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/modsupport.c
View File

@ -161,7 +161,17 @@ do_mktuple(const char **p_format, va_list *p_va, int endchar, int n, int flags)
/* Note that we can't bail immediately on error as this will leak /* Note that we can't bail immediately on error as this will leak
refcounts on any 'N' arguments. */ refcounts on any 'N' arguments. */
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
PyObject *w = do_mkvalue(p_format, p_va, flags); PyObject *w;
if (itemfailed) {
PyObject *exception, *value, *tb;
PyErr_Fetch(&exception, &value, &tb);
w = do_mkvalue(p_format, p_va, flags);
PyErr_Restore(exception, value, tb);
}
else {
w = do_mkvalue(p_format, p_va, flags);
}
if (w == NULL) { if (w == NULL) {
itemfailed = 1; itemfailed = 1;
Py_INCREF(Py_None); Py_INCREF(Py_None);