bpo-38410: Properly handle PySys_Audit() failures (GH-16657)

ZackerySpytz · web-flow · commit 79ceccd1ec6e · 2020-03-26T12:11:13.000Z
diff --git a/Include/cpython/ceval.h b/Include/cpython/ceval.h
@@ -11,9 +11,9 @@ PyAPI_DATA(int) _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyO
 PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
 PyAPI_FUNC(int) _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg);
 PyAPI_FUNC(int) _PyEval_GetCoroutineOriginTrackingDepth(void);
-PyAPI_FUNC(void) _PyEval_SetAsyncGenFirstiter(PyObject *);
+PyAPI_FUNC(int) _PyEval_SetAsyncGenFirstiter(PyObject *);
 PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void);
-PyAPI_FUNC(void) _PyEval_SetAsyncGenFinalizer(PyObject *);
+PyAPI_FUNC(int) _PyEval_SetAsyncGenFinalizer(PyObject *);
 PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void);
 
 /* Helper to look up a builtin object */
diff --git a/Misc/NEWS.d/next/Library/2019-10-09-08-14-25.bpo-38410._YyoMV.rst b/Misc/NEWS.d/next/Library/2019-10-09-08-14-25.bpo-38410._YyoMV.rst
@@ -0,0 +1,2 @@
+Properly handle :func:`sys.audit` failures in
+:func:`sys.set_asyncgen_hooks`.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -4785,17 +4785,18 @@ _PyEval_GetCoroutineOriginTrackingDepth(void)
     return tstate->coroutine_origin_tracking_depth;
 }
 
-void
+int
 _PyEval_SetAsyncGenFirstiter(PyObject *firstiter)
 {
     PyThreadState *tstate = _PyThreadState_GET();
 
     if (PySys_Audit("sys.set_asyncgen_hook_firstiter", NULL) < 0) {
-        return;
+        return -1;
     }
 
     Py_XINCREF(firstiter);
     Py_XSETREF(tstate->async_gen_firstiter, firstiter);
+    return 0;
 }
 
 PyObject *
@@ -4805,17 +4806,18 @@ _PyEval_GetAsyncGenFirstiter(void)
     return tstate->async_gen_firstiter;
 }
 
-void
+int
 _PyEval_SetAsyncGenFinalizer(PyObject *finalizer)
 {
     PyThreadState *tstate = _PyThreadState_GET();
 
     if (PySys_Audit("sys.set_asyncgen_hook_finalizer", NULL) < 0) {
-        return;
+        return -1;
     }
 
     Py_XINCREF(finalizer);
     Py_XSETREF(tstate->async_gen_finalizer, finalizer);
+    return 0;
 }
 
 PyObject *
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1222,10 +1222,12 @@ sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw)
                           Py_TYPE(finalizer)->tp_name);
             return NULL;
         }
-        _PyEval_SetAsyncGenFinalizer(finalizer);
+        if (_PyEval_SetAsyncGenFinalizer(finalizer) < 0) {
+            return NULL;
+        }
     }
-    else if (finalizer == Py_None) {
-        _PyEval_SetAsyncGenFinalizer(NULL);
+    else if (finalizer == Py_None && _PyEval_SetAsyncGenFinalizer(NULL) < 0) {
+        return NULL;
     }
 
     if (firstiter && firstiter != Py_None) {
@@ -1235,10 +1237,12 @@ sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw)
                           Py_TYPE(firstiter)->tp_name);
             return NULL;
         }
-        _PyEval_SetAsyncGenFirstiter(firstiter);
+        if (_PyEval_SetAsyncGenFirstiter(firstiter) < 0) {
+            return NULL;
+        }
     }
-    else if (firstiter == Py_None) {
-        _PyEval_SetAsyncGenFirstiter(NULL);
+    else if (firstiter == Py_None && _PyEval_SetAsyncGenFirstiter(NULL) < 0) {
+        return NULL;
     }
 
     Py_RETURN_NONE;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Properly handle :func:`sys.audit` failures in
	`2`	+:func:`sys.set_asyncgen_hooks`.
Original file line number	Diff line number	Diff line change
`@@ -4785,17 +4785,18 @@ _PyEval_GetCoroutineOriginTrackingDepth(void)`
`4785`	`4785`	`return tstate->coroutine_origin_tracking_depth;`
`4786`	`4786`	`}`
`4787`	`4787`
`4788`		`-void`
	`4788`	`+int`
`4789`	`4789`	`_PyEval_SetAsyncGenFirstiter(PyObject *firstiter)`
`4790`	`4790`	`{`
`4791`	`4791`	`PyThreadState *tstate = _PyThreadState_GET();`
`4792`	`4792`
`4793`	`4793`	`if (PySys_Audit("sys.set_asyncgen_hook_firstiter", NULL) < 0) {`
`4794`		`- return;`
	`4794`	`+ return -1;`
`4795`	`4795`	`}`
`4796`	`4796`
`4797`	`4797`	`Py_XINCREF(firstiter);`
`4798`	`4798`	`Py_XSETREF(tstate->async_gen_firstiter, firstiter);`
	`4799`	`+ return 0;`
`4799`	`4800`	`}`
`4800`	`4801`
`4801`	`4802`	`PyObject *`
`@@ -4805,17 +4806,18 @@ _PyEval_GetAsyncGenFirstiter(void)`
`4805`	`4806`	`return tstate->async_gen_firstiter;`
`4806`	`4807`	`}`
`4807`	`4808`
`4808`		`-void`
	`4809`	`+int`
`4809`	`4810`	`_PyEval_SetAsyncGenFinalizer(PyObject *finalizer)`
`4810`	`4811`	`{`
`4811`	`4812`	`PyThreadState *tstate = _PyThreadState_GET();`
`4812`	`4813`
`4813`	`4814`	`if (PySys_Audit("sys.set_asyncgen_hook_finalizer", NULL) < 0) {`
`4814`		`- return;`
	`4815`	`+ return -1;`
`4815`	`4816`	`}`
`4816`	`4817`
`4817`	`4818`	`Py_XINCREF(finalizer);`
`4818`	`4819`	`Py_XSETREF(tstate->async_gen_finalizer, finalizer);`
	`4820`	`+ return 0;`
`4819`	`4821`	`}`
`4820`	`4822`
`4821`	`4823`	`PyObject *`
Original file line number	Diff line number	Diff line change
`@@ -1222,10 +1222,12 @@ sys_set_asyncgen_hooks(PyObject self, PyObject args, PyObject *kw)`
`1222`	`1222`	`Py_TYPE(finalizer)->tp_name);`
`1223`	`1223`	`return NULL;`
`1224`	`1224`	`}`
`1225`		`- _PyEval_SetAsyncGenFinalizer(finalizer);`
	`1225`	`+ if (_PyEval_SetAsyncGenFinalizer(finalizer) < 0) {`
	`1226`	`+ return NULL;`
	`1227`	`+ }`
`1226`	`1228`	`}`
`1227`		`- else if (finalizer == Py_None) {`
`1228`		`- _PyEval_SetAsyncGenFinalizer(NULL);`
	`1229`	`+ else if (finalizer == Py_None && _PyEval_SetAsyncGenFinalizer(NULL) < 0) {`
	`1230`	`+ return NULL;`
`1229`	`1231`	`}`
`1230`	`1232`
`1231`	`1233`	`if (firstiter && firstiter != Py_None) {`
`@@ -1235,10 +1237,12 @@ sys_set_asyncgen_hooks(PyObject self, PyObject args, PyObject *kw)`
`1235`	`1237`	`Py_TYPE(firstiter)->tp_name);`
`1236`	`1238`	`return NULL;`
`1237`	`1239`	`}`
`1238`		`- _PyEval_SetAsyncGenFirstiter(firstiter);`
	`1240`	`+ if (_PyEval_SetAsyncGenFirstiter(firstiter) < 0) {`
	`1241`	`+ return NULL;`
	`1242`	`+ }`
`1239`	`1243`	`}`
`1240`		`- else if (firstiter == Py_None) {`
`1241`		`- _PyEval_SetAsyncGenFirstiter(NULL);`
	`1244`	`+ else if (firstiter == Py_None && _PyEval_SetAsyncGenFirstiter(NULL) < 0) {`
	`1245`	`+ return NULL;`
`1242`	`1246`	`}`
`1243`	`1247`
`1244`	`1248`	`Py_RETURN_NONE;`