pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-22 19:06:37 +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/python/weechat-python.c
+31 -1
View File
@@ -440,7 +440,7 @@ weechat_python_exec (struct t_plugin_script *script,
struct t_plugin_script *old_python_current_script;
PyThreadState *old_interpreter;
PyObject *evMain, *evDict, *evFunc, *rc;
void *argv2[16], *ret_value;
void *argv2[16], *ret_value, *ret_temp;
int i, argc, *ret_int;
ret_value = NULL;
@@ -518,6 +518,36 @@ weechat_python_exec (struct t_plugin_script *script,
ret_value = NULL;
Py_XDECREF(rc);
}
else if ((ret_type == WEECHAT_SCRIPT_EXEC_POINTER) && (PyUnicode_Check (rc)))
{
ret_temp = weechat_python_unicode_to_string (rc);
if (ret_temp)
{
ret_value = plugin_script_str2ptr (weechat_python_plugin,
script->name, function,
ret_temp);
free (ret_temp);
}
else
{
ret_value = NULL;
}
Py_XDECREF(rc);
}
else if ((ret_type == WEECHAT_SCRIPT_EXEC_POINTER) && (PyBytes_Check (rc)))
{
if (PyBytes_AsString (rc))
{
ret_value = plugin_script_str2ptr (weechat_python_plugin,
script->name, function,
PyBytes_AsString (rc));
}
else
{
ret_value = NULL;
}
Py_XDECREF(rc);
}
else if ((ret_type == WEECHAT_SCRIPT_EXEC_INT) && (PY_INTEGER_CHECK(rc)))
{
ret_int = malloc (sizeof (*ret_int));