]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-43472: Ensure PyInterpreterState_New audit events are raised when called through...
authorSteve Dower <steve.dower@python.org>
Wed, 21 Apr 2021 22:34:29 +0000 (23:34 +0100)
committerGitHub <noreply@github.com>
Wed, 21 Apr 2021 22:34:29 +0000 (23:34 +0100)
Doc/library/sys.rst
Misc/NEWS.d/next/Security/2021-04-21-22-53-31.bpo-43472.gjLBTb.rst [new file with mode: 0644]
Modules/_xxsubinterpretersmodule.c

index 721edd1495aa5b7ce037fea1aa6ce30474ec5c00..e431d1b50309c308f3ed1a1c7c369af79debfbb5 100644 (file)
@@ -26,12 +26,12 @@ always available.
 .. function:: addaudithook(hook)
 
    Append the callable *hook* to the list of active auditing hooks for the
-   current interpreter.
+   current (sub)interpreter.
 
    When an auditing event is raised through the :func:`sys.audit` function, each
    hook will be called in the order it was added with the event name and the
    tuple of arguments. Native hooks added by :c:func:`PySys_AddAuditHook` are
-   called first, followed by hooks added in the current interpreter.  Hooks
+   called first, followed by hooks added in the current (sub)interpreter.  Hooks
    can then log the event, raise an exception to abort the operation,
    or terminate the process entirely.
 
diff --git a/Misc/NEWS.d/next/Security/2021-04-21-22-53-31.bpo-43472.gjLBTb.rst b/Misc/NEWS.d/next/Security/2021-04-21-22-53-31.bpo-43472.gjLBTb.rst
new file mode 100644 (file)
index 0000000..e38dc16
--- /dev/null
@@ -0,0 +1,3 @@
+Ensures interpreter-level audit hooks receive the
+``cpython.PyInterpreterState_New`` event when called through the
+``_xxsubinterpreters`` module.
index 8943ebf455df4b676f6db241d3744deff1404d5c..b94b130d70df71e6e82a7e488a1879c402eb4faa 100644 (file)
@@ -2025,7 +2025,7 @@ interp_create(PyObject *self, PyObject *args, PyObject *kwds)
     }
 
     // Create and initialize the new interpreter.
-    PyThreadState *save_tstate = PyThreadState_Swap(NULL);
+    PyThreadState *save_tstate = PyThreadState_Get();
     // XXX Possible GILState issues?
     PyThreadState *tstate = _Py_NewInterpreter(isolated);
     PyThreadState_Swap(save_tstate);