Skip to content

[3.8] bpo-38410: Properly handle PySys_Audit() failures #18658

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
serhiy-storchaka merged 1 commit into from
Mar 2, 2020
+57 −32
Merged

[3.8] bpo-38410: Properly handle PySys_Audit() failures #18658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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`. Based on patch by Zackery Spytz.
26 changes: 0 additions & 26 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4742,39 +4742,13 @@ _PyEval_GetCoroutineOriginTrackingDepth(void)
return tstate->coroutine_origin_tracking_depth;
}

void
_PyEval_SetAsyncGenFirstiter(PyObject *firstiter)
{
PyThreadState *tstate = _PyThreadState_GET();

if (PySys_Audit("sys.set_asyncgen_hook_firstiter", NULL) < 0) {
return;
}

Py_XINCREF(firstiter);
Py_XSETREF(tstate->async_gen_firstiter, firstiter);
}

PyObject *
_PyEval_GetAsyncGenFirstiter(void)
{
PyThreadState *tstate = _PyThreadState_GET();
return tstate->async_gen_firstiter;
}

void
_PyEval_SetAsyncGenFinalizer(PyObject *finalizer)
{
PyThreadState *tstate = _PyThreadState_GET();

if (PySys_Audit("sys.set_asyncgen_hook_finalizer", NULL) < 0) {
return;
}

Py_XINCREF(finalizer);
Py_XSETREF(tstate->async_gen_finalizer, finalizer);
}

PyObject *
_PyEval_GetAsyncGenFinalizer(void)
{
Expand Down
61 changes: 55 additions & 6 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,6 +1178,51 @@ static PyStructSequence_Desc asyncgen_hooks_desc = {
2
};

static int
set_async_gen_firstiter(PyObject *firstiter)
{
PyThreadState *tstate = _PyThreadState_GET();

if (PySys_Audit("sys.set_asyncgen_hook_firstiter", NULL) < 0) {
return -1;
}

Py_XINCREF(firstiter);
Py_XSETREF(tstate->async_gen_firstiter, firstiter);
return 0;
}

void
_PyEval_SetAsyncGenFirstiter(PyObject *firstiter)
{
if (set_async_gen_firstiter(firstiter) < 0) {
PyErr_WriteUnraisable(NULL);
}
}

static int
set_async_gen_finalizer(PyObject *finalizer)
{
PyThreadState *tstate = _PyThreadState_GET();

if (PySys_Audit("sys.set_asyncgen_hook_finalizer", NULL) < 0) {
return -1;
}

Py_XINCREF(finalizer);
Py_XSETREF(tstate->async_gen_finalizer, finalizer);
return 0;
}

void
_PyEval_SetAsyncGenFinalizer(PyObject *finalizer)
{
if (set_async_gen_finalizer(finalizer) < 0) {
PyErr_WriteUnraisable(NULL);
}
}


static PyObject *
sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw)
{
Expand All @@ -1198,10 +1243,12 @@ sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw)
Py_TYPE(finalizer)->tp_name);
return NULL;
}
_PyEval_SetAsyncGenFinalizer(finalizer);
if (set_async_gen_finalizer(finalizer) < 0) {
return NULL;
}
}
else if (finalizer == Py_None) {
_PyEval_SetAsyncGenFinalizer(NULL);
else if (finalizer == Py_None && set_async_gen_finalizer(NULL) < 0) {
return NULL;
}

if (firstiter && firstiter != Py_None) {
Expand All @@ -1211,10 +1258,12 @@ sys_set_asyncgen_hooks(PyObject *self, PyObject *args, PyObject *kw)
Py_TYPE(firstiter)->tp_name);
return NULL;
}
_PyEval_SetAsyncGenFirstiter(firstiter);
if (set_async_gen_firstiter(firstiter) < 0) {
return NULL;
}
}
else if (firstiter == Py_None) {
_PyEval_SetAsyncGenFirstiter(NULL);
else if (firstiter == Py_None && set_async_gen_firstiter(NULL) < 0) {
return NULL;
}

Py_RETURN_NONE;
Expand Down