pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-25 12:26:40 +02:00
Code Activity

scripts: fix return value of hook_infolist callback (pointer instead of string)

Browse Source
This commit is contained in:
Sébastien Helleu
2018-04-12 00:12:20 +02:00
parent 5ae557fa52
commit 41d63511b4
18 changed files with 129 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/lua/weechat-lua-api.c
+1 -1
View File
@@ -3124,7 +3124,7 @@ weechat_lua_api_hook_infolist_cb (const void *pointer, void *data,
result = (struct t_infolist *)weechat_lua_exec (
script,
WEECHAT_SCRIPT_EXEC_STRING,
WEECHAT_SCRIPT_EXEC_POINTER,
ptr_function,
"ssss", func_argv);
src/plugins/lua/weechat-lua.c
+18
View File
@@ -346,6 +346,24 @@ weechat_lua_exec (struct t_plugin_script *script, int ret_type,
function);
}
}
else if (ret_type == WEECHAT_SCRIPT_EXEC_POINTER)
{
ret_value = (char *) lua_tostring (lua_current_interpreter, -1);
if (ret_value)
{
ret_value = plugin_script_str2ptr (weechat_lua_plugin,
script->name, function,
ret_value);
}
else
{
weechat_printf (NULL,
weechat_gettext ("%s%s: function \"%s\" must "
"return a valid value"),
weechat_prefix ("error"), LUA_PLUGIN_NAME,
function);
}
}
else if (ret_type == WEECHAT_SCRIPT_EXEC_INT)
{
ret_i = malloc (sizeof (*ret_i));