pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-26 04:46: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/lua/weechat-lua-api.c
+2 -2
View File
@@ -2657,7 +2657,7 @@ weechat_lua_api_hook_signal_cb (void *data, char *signal, char *type_data,
{
struct t_script_callback *script_callback;
char *lua_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;
@@ -2666,7 +2666,7 @@ weechat_lua_api_hook_signal_cb (void *data, char *signal, char *type_data,
free_needed = 0;
if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_STRING) == 0)
{
lua_argv[1] = (char *)signal_data;
lua_argv[1] = (signal_data) ? (char *)signal_data : empty_value;
}
else if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_INT) == 0)
{
src/plugins/scripts/lua/weechat-lua.c
+31 -1
View File
@@ -57,10 +57,13 @@ weechat_lua_exec (struct t_plugin_script *script,
{
void *ret_value;
int argc, *ret_i;
struct t_plugin_script *old_lua_current_script;
lua_current_interpreter = script->interpreter;
lua_getglobal (lua_current_interpreter, function);
old_lua_current_script = lua_current_script;
lua_current_script = script;
if (argv && argv[0])
@@ -98,6 +101,7 @@ weechat_lua_exec (struct t_plugin_script *script,
weechat_gettext ("%s%s: error: %s"),
weechat_prefix ("error"), "lua",
lua_tostring (lua_current_interpreter, -1));
lua_current_script = old_lua_current_script;
return NULL;
}
@@ -113,9 +117,12 @@ weechat_lua_exec (struct t_plugin_script *script,
else
{
WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS(function);
lua_current_script = old_lua_current_script;
return NULL;
}
lua_current_script = old_lua_current_script;
return ret_value;
}
@@ -257,6 +264,7 @@ weechat_lua_unload (struct t_plugin_script *script)
{
int *r;
char *lua_argv[1] = { NULL };
void *interpreter;
weechat_printf (NULL,
weechat_gettext ("%s: unloading script \"%s\""),
@@ -272,9 +280,11 @@ weechat_lua_unload (struct t_plugin_script *script)
free (r);
}
lua_close (script->interpreter);
interpreter = script->interpreter;
script_remove (weechat_lua_plugin, &lua_scripts, script);
lua_close (script->interpreter);
}
/*
@@ -436,6 +446,25 @@ weechat_lua_debug_dump_cb (void *data, char *signal, char *type_data,
return WEECHAT_RC_OK;
}
/*
* weechat_lua_buffer_closed_cb: callback called when a buffer is closed
*/
int
weechat_lua_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 (lua_scripts, signal_data);
return WEECHAT_RC_OK;
}
/*
* weechat_plugin_init: initialize Lua plugin
*/
@@ -450,6 +479,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin)
&weechat_lua_command_cb,
&weechat_lua_completion_cb,
&weechat_lua_debug_dump_cb,
&weechat_lua_buffer_closed_cb,
&weechat_lua_load_cb);
/* init ok */