bpo-44472: Fix ltrace functionality when exceptions are raised (GH-26822) (#26831)

miss-islington · pablogsal · web-flow · commit 6fb4248cd950 · 2021-07-12T17:11:10.000+02:00
(cherry picked from commit 06cda80) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst b/Misc/NEWS.d/next/Core and Builtins/2021-06-21-11-19-54.bpo-44472.Vvm1yn.rst
@@ -0,0 +1 @@
+Fix ltrace functionality when exceptions are raised. Patch by Pablo Galindo
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4598,11 +4598,14 @@ static int
 prtrace(PyThreadState *tstate, PyObject *v, const char *str)
 {
     printf("%s ", str);
+    PyObject *type, *value, *traceback;
+    PyErr_Fetch(&type, &value, &traceback);
     if (PyObject_Print(v, stdout, 0) != 0) {
         /* Don't know what else to do */
         _PyErr_Clear(tstate);
     }
     printf("\n");
+    PyErr_Restore(type, value, traceback);
     return 1;
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix ltrace functionality when exceptions are raised. Patch by Pablo Galindo`
Original file line number	Diff line number	Diff line change
`@@ -4598,11 +4598,14 @@ static int`
`4598`	`4598`	`prtrace(PyThreadState tstate, PyObject v, const char *str)`
`4599`	`4599`	`{`
`4600`	`4600`	`printf("%s ", str);`
	`4601`	`+ PyObject type, value, *traceback;`
	`4602`	`+ PyErr_Fetch(&type, &value, &traceback);`
`4601`	`4603`	`if (PyObject_Print(v, stdout, 0) != 0) {`
`4602`	`4604`	`/* Don't know what else to do */`
`4603`	`4605`	`_PyErr_Clear(tstate);`
`4604`	`4606`	`}`
`4605`	`4607`	`printf("\n");`
	`4608`	`+ PyErr_Restore(type, value, traceback);`
`4606`	`4609`	`return 1;`
`4607`	`4610`	`}`
`4608`	`4611`	`#endif`