PyErr_NormalizeException doesn't like being called with an exception set

serhiy-storchaka · serhiy-storchaka · commit ec87a13e5d67 · 2014-06-11T07:19:39.000+03:00
(issues #21677, #21310).
diff --git 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
@@ -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
@@ -2619,14 +2619,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;

Original file line number	Diff line number	Diff line change
`@@ -548,14 +548,14 @@ buffered_close(buffered self, PyObject args)`
`548`	`548`	`PyErr_Restore(exc, val, tb);`
`549`	`549`	`}`
`550`	`550`	`else {`
`551`		`- PyObject *val2;`
	`551`	`+ PyObject exc2, val2, *tb2;`
	`552`	`+ PyErr_Fetch(&exc2, &val2, &tb2);`
`552`	`553`	`PyErr_NormalizeException(&exc, &val, &tb);`
`553`	`554`	`Py_DECREF(exc);`
`554`	`555`	`Py_XDECREF(tb);`
`555`		`- PyErr_Fetch(&exc, &val2, &tb);`
`556`		`- PyErr_NormalizeException(&exc, &val2, &tb);`
	`556`	`+ PyErr_NormalizeException(&exc2, &val2, &tb2);`
`557`	`557`	`PyException_SetContext(val2, val);`
`558`		`- PyErr_Restore(exc, val2, tb);`
	`558`	`+ PyErr_Restore(exc2, val2, tb2);`
`559`	`559`	`}`
`560`	`560`	`}`
`561`	`561`
Original file line number	Diff line number	Diff line change
`@@ -2619,14 +2619,14 @@ textiowrapper_close(textio self, PyObject args)`
`2619`	`2619`	`PyErr_Restore(exc, val, tb);`
`2620`	`2620`	`}`
`2621`	`2621`	`else {`
`2622`		`- PyObject *val2;`
	`2622`	`+ PyObject exc2, val2, *tb2;`
	`2623`	`+ PyErr_Fetch(&exc2, &val2, &tb2);`
`2623`	`2624`	`PyErr_NormalizeException(&exc, &val, &tb);`
`2624`	`2625`	`Py_DECREF(exc);`
`2625`	`2626`	`Py_XDECREF(tb);`
`2626`		`- PyErr_Fetch(&exc, &val2, &tb);`
`2627`		`- PyErr_NormalizeException(&exc, &val2, &tb);`
	`2627`	`+ PyErr_NormalizeException(&exc2, &val2, &tb2);`
`2628`	`2628`	`PyException_SetContext(val2, val);`
`2629`		`- PyErr_Restore(exc, val2, tb);`
	`2629`	`+ PyErr_Restore(exc2, val2, tb2);`
`2630`	`2630`	`}`
`2631`	`2631`	`}`
`2632`	`2632`	`return res;`