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

_python_plugin_new_interpreter switches to the new interpreter

Browse Source 
No need to do PyThreadState_Swap in the caller.
This commit is contained in:
Todd C. Miller
2023-07-20 06:58:53 -06:00
parent cc939297a1
commit 7a10cdc286
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/python/python_plugin_common.c
View File

@@ -137,6 +137,7 @@ _import_module(const char *path)
debug_return_ptr(module); debug_return_ptr(module);
} }
// Create a new sub-interpreter and switch to it.
static PyThreadState * static PyThreadState *
_python_plugin_new_interpreter(void) _python_plugin_new_interpreter(void)
{ {
@@ -473,7 +474,7 @@ cleanup:
static PyObject * static PyObject *
_python_plugin_get_class(const char *plugin_path, PyObject *py_module, const char *plugin_class) _python_plugin_get_class(const char *plugin_path, PyObject *py_module, const char *plugin_class)
{ {
debug_decl(python_plugin_init, PYTHON_DEBUG_PLUGIN_LOAD); debug_decl(_python_plugin_get_class, PYTHON_DEBUG_PLUGIN_LOAD);
PyObject *py_plugin_list = NULL, *py_class = NULL; PyObject *py_plugin_list = NULL, *py_class = NULL;
if (plugin_class == NULL) { if (plugin_class == NULL) {
@@ -540,7 +541,6 @@ python_plugin_init(struct PluginContext *plugin_ctx, char * const plugin_options
if (plugin_ctx->py_interpreter == NULL) { if (plugin_ctx->py_interpreter == NULL) {
goto cleanup; goto cleanup;
} }
PyThreadState_Swap(plugin_ctx->py_interpreter);
if (sudo_module_set_default_loghandler() < 0) if (sudo_module_set_default_loghandler() < 0)
goto cleanup; goto cleanup;
@@ -713,6 +713,7 @@ python_plugin_close(struct PluginContext *plugin_ctx, const char *callback_name,
} }
python_plugin_deinit(plugin_ctx); python_plugin_deinit(plugin_ctx);
PyThreadState_Swap(py_ctx.py_main_interpreter);
debug_return; debug_return;
} }