isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We can rely on Py_FinalizeEx() to free sub-interpreters.

Browse Source
This commit is contained in:
Todd C. Miller
2023-07-19 09:16:51 -06:00
parent 2cb4835781
commit a12dbfe909
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/python/python_plugin_common.c
View File

@@ -750,31 +750,17 @@ void
python_plugin_unlink(void) python_plugin_unlink(void)
{ {
debug_decl(python_plugin_unlink, PYTHON_DEBUG_INTERNAL); debug_decl(python_plugin_unlink, PYTHON_DEBUG_INTERNAL);
if (py_ctx.py_main_interpreter == NULL)
return;
if (Py_IsInitialized()) { if (Py_IsInitialized()) {
sudo_debug_printf(SUDO_DEBUG_NOTICE, "Closing: deinit python %zu subinterpreters\n", sudo_debug_printf(SUDO_DEBUG_NOTICE, "Closing: deinit python interpreters\n");
py_ctx.interpreter_count);
while (py_ctx.interpreter_count != 0) {
PyThreadState *py_interpreter =
py_ctx.py_subinterpreters[--py_ctx.interpreter_count];
PyThreadState_Swap(py_interpreter);
Py_EndInterpreter(py_interpreter);
}
sudo_debug_printf(SUDO_DEBUG_NOTICE, "Closing: deinit main interpreter\n");
// we need to call finalize from the main interpreter
PyThreadState_Swap(py_ctx.py_main_interpreter);
if (Py_FinalizeEx() != 0) { if (Py_FinalizeEx() != 0) {
sudo_debug_printf(SUDO_DEBUG_WARN, "Closing: failed to deinit python interpreter\n"); sudo_debug_printf(SUDO_DEBUG_WARN, "Closing: failed to deinit python interpreters\n");
} }
// Restore inittab so "sudo" module does not remain there (as garbage) // Restore inittab so "sudo" module does not remain there (as garbage)
_restore_inittab(); _restore_inittab();
} }
py_ctx_reset(); py_ctx_reset();
debug_return; debug_return;
} }