Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 26, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2427c7
bpo-38410: Properly handle PySys_Audit() failures
ZackerySpytz Oct 8, 2019
a948991
Add a news entry.
ZackerySpytz Oct 9, 2019
e1d155c
Merge remote-tracking branch 'upstream/master' into bpo-38410-PySys_A…
ZackerySpytz Mar 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Include/cpython/ceval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-10-09-08-14-25.bpo-38410._YyoMV.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Properly handle :func:`sys.audit` failures in
:func:`sys.set_asyncgen_hooks`.
10 changes: 6 additions & 4 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4685,17 +4685,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 *
Expand All @@ -4705,17 +4706,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 *
Expand Down
16 changes: 10 additions & 6 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand Down