pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 03:03:12 +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/guile/weechat-guile-api.c
+1 -1
View File
@@ -3001,7 +3001,7 @@ weechat_guile_api_hook_infolist_cb (const void *pointer, void *data,
result = (struct t_infolist *)weechat_guile_exec (
script,
WEECHAT_SCRIPT_EXEC_STRING,
WEECHAT_SCRIPT_EXEC_POINTER,
ptr_function,
"ssss", func_argv);
src/plugins/guile/weechat-guile.c
+16 -1
View File
@@ -337,7 +337,7 @@ weechat_guile_exec (struct t_plugin_script *script,
{
struct t_plugin_script *old_guile_current_script;
SCM rc, old_current_module;
void *argv2[17], *ret_value;
void *argv2[17], *ret_value, *ret_temp;
int i, argc, *ret_int;
ret_value = NULL;
@@ -386,6 +386,21 @@ weechat_guile_exec (struct t_plugin_script *script,
{
ret_value = scm_to_locale_string (rc);
}
else if ((ret_type == WEECHAT_SCRIPT_EXEC_POINTER) && (scm_is_string (rc)))
{
ret_temp = scm_to_locale_string (rc);
if (ret_temp)
{
ret_value = plugin_script_str2ptr (weechat_guile_plugin,
script->name, function,
ret_temp);
free (ret_temp);
}
else
{
ret_value = NULL;
}
}
else if ((ret_type == WEECHAT_SCRIPT_EXEC_INT) && (scm_is_integer (rc)))
{
ret_int = malloc (sizeof (*ret_int));