From: Victor Stinner <vstinner@python.org>
Date: Mon, 16 Mar 2020 16:41:44 +0000 (+0100)
Subject: bpo-35370: PyEval_SetTrace() logs unraisable error (GH-18977)
X-Git-Tag: v3.9.0a5~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6a58507820c67e8d0fb07875cd1b1d9f5e510a8;p=thirdparty%2FPython%2Fcpython.git

bpo-35370: PyEval_SetTrace() logs unraisable error (GH-18977)

If PySys_Audit() fails in PyEval_SetProfile() or PyEval_SetTrace(),
log the error as an unraisable exception.
---

diff --git a/Misc/NEWS.d/next/C API/2020-03-13-16-44-23.bpo-35370.sXRA-r.rst b/Misc/NEWS.d/next/C API/2020-03-13-16-44-23.bpo-35370.sXRA-r.rst
new file mode 100644
index 000000000000..d3f1d293b693
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2020-03-13-16-44-23.bpo-35370.sXRA-r.rst	
@@ -0,0 +1,2 @@
+If :c:func:`PySys_Audit` fails in :c:func:`PyEval_SetProfile` or
+:c:func:`PyEval_SetTrace`, log the error as an unraisable exception.
diff --git a/Python/ceval.c b/Python/ceval.c
index fc4f718de28d..b359fb079841 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4620,7 +4620,10 @@ void
 PyEval_SetProfile(Py_tracefunc func, PyObject *arg)
 {
     PyThreadState *tstate = _PyThreadState_GET();
-    (void)_PyEval_SetProfile(tstate, func, arg);
+    if (_PyEval_SetProfile(tstate, func, arg) < 0) {
+        /* Log PySys_Audit() error */
+        _PyErr_WriteUnraisableMsg("in PyEval_SetProfile", NULL);
+    }
 }
 
 int
@@ -4661,7 +4664,10 @@ void
 PyEval_SetTrace(Py_tracefunc func, PyObject *arg)
 {
     PyThreadState *tstate = _PyThreadState_GET();
-    (void)_PyEval_SetTrace(tstate, func, arg);
+    if (_PyEval_SetTrace(tstate, func, arg) < 0) {
+        /* Log PySys_Audit() error */
+        _PyErr_WriteUnraisableMsg("in PyEval_SetTrace", NULL);
+    }
 }