pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-23 03:16:37 +02:00
Code Activity

Fixed crash with scripts when WeeChat calls functions of many scripts at same time with callbacks (bug #23109)

Browse Source
This commit is contained in:
Sebastien Helleu
2008-04-30 13:21:21 +02:00
parent 760e216c5b
commit 886b81498f
13 changed files with 234 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/scripts/python/weechat-python-api.c
+2 -2
View File
@@ -2341,7 +2341,7 @@ weechat_python_api_hook_signal_cb (void *data, char *signal, char *type_data,
{
struct t_script_callback *script_callback;
char *python_argv[3];
static char value_str[64];
static char value_str[64], empty_value[1] = { '\0' };
int *rc, ret, free_needed;
script_callback = (struct t_script_callback *)data;
@@ -2350,7 +2350,7 @@ weechat_python_api_hook_signal_cb (void *data, char *signal, char *type_data,
free_needed = 0;
if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_STRING) == 0)
{
python_argv[1] = (char *)signal_data;
python_argv[1] = (signal_data) ? (char *)signal_data : empty_value;
}
else if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_INT) == 0)
{
src/plugins/scripts/python/weechat-python.c
+41 -5
View File
@@ -59,6 +59,7 @@ weechat_python_exec (struct t_plugin_script *script,
PyObject *rc;
void *ret_value;
int *ret_i;
struct t_plugin_script *old_python_current_script;
/* PyEval_AcquireLock (); */
PyThreadState_Swap (script->interpreter);
@@ -75,7 +76,8 @@ weechat_python_exec (struct t_plugin_script *script,
/* PyEval_ReleaseThread (python_current_script->interpreter); */
return NULL;
}
old_python_current_script = python_current_script;
python_current_script = script;
if (argv && argv[0])
@@ -151,6 +153,9 @@ weechat_python_exec (struct t_plugin_script *script,
"a valid value"),
weechat_prefix ("error"), "python", function);
/* PyEval_ReleaseThread (python_current_script->interpreter); */
python_current_script = old_python_current_script;
if (python_current_script)
PyThreadState_Swap (python_current_script->interpreter);
return NULL;
}
@@ -161,13 +166,21 @@ weechat_python_exec (struct t_plugin_script *script,
"function \"%s\""),
weechat_prefix ("error"), "python", function);
/* PyEval_ReleaseThread (python_current_script->interpreter); */
python_current_script = old_python_current_script;
if (python_current_script)
PyThreadState_Swap (python_current_script->interpreter);
return NULL;
}
if (PyErr_Occurred ()) PyErr_Print ();
if (PyErr_Occurred ())
PyErr_Print ();
/* PyEval_ReleaseThread (python_current_script->interpreter); */
python_current_script = old_python_current_script;
if (python_current_script)
PyThreadState_Swap (python_current_script->interpreter);
return ret_value;
}
@@ -426,6 +439,7 @@ void
weechat_python_unload (struct t_plugin_script *script)
{
int *r;
void *interpreter;
weechat_printf (NULL,
weechat_gettext ("%s: unloading script \"%s\""),
@@ -438,11 +452,13 @@ weechat_python_unload (struct t_plugin_script *script)
if (r)
free (r);
}
PyThreadState_Swap (script->interpreter);
Py_EndInterpreter (script->interpreter);
interpreter = script->interpreter;
script_remove (weechat_python_plugin, &python_scripts, script);
PyThreadState_Swap (interpreter);
Py_EndInterpreter (interpreter);
}
/*
@@ -604,6 +620,25 @@ weechat_python_debug_dump_cb (void *data, char *signal, char *type_data,
return WEECHAT_RC_OK;
}
/*
* weechat_python_buffer_closed_cb: callback called when a buffer is closed
*/
int
weechat_python_buffer_closed_cb (void *data, char *signal, char *type_data,
void *signal_data)
{
/* make C compiler happy */
(void) data;
(void) signal;
(void) type_data;
if (signal_data)
script_remove_buffer_callbacks (python_scripts, signal_data);
return WEECHAT_RC_OK;
}
/*
* weechat_plugin_init: initialize Python plugin
*/
@@ -644,6 +679,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin)
&weechat_python_command_cb,
&weechat_python_completion_cb,
&weechat_python_debug_dump_cb,
&weechat_python_buffer_closed_cb,
&weechat_python_load_cb);
/* init ok */