foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

python: fix crash when invalid UTF-8 string is in a WeeChat hashtable converted to a Python dict (closes #1463)

master
Sébastien Helleu 2020-04-04 18:10:02 +02:00
parent e4bd582a97
commit fae149b361
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.adoc
View File

@ -18,6 +18,10 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
[[v2.9]]
== Version 2.9 (under dev)
Bug fixes::
* python: fix crash when invalid UTF-8 string is in a WeeChat hashtable converted to a Python dict (issue #1463)
Tests::
* irc: add tests on IRC color functions

28
src/plugins/python/weechat-python.c
View File

@ -234,13 +234,31 @@ weechat_python_hashtable_map_cb (void *data,
dict = (PyObject *)data;
dict_key = Py_BuildValue ("s", key);
dict_value = Py_BuildValue ("s", value);
#if PY_MAJOR_VERSION >= 3
/* key */
if (weechat_utf8_is_valid (key, -1, NULL))
dict_key = Py_BuildValue ("s", key); /* Python 3: str */
else
dict_key = Py_BuildValue ("y", key); /* Python 3: bytes */
/* value */
if (weechat_utf8_is_valid (value, -1, NULL))
dict_value = Py_BuildValue ("s", value); /* Python 3: str */
else
dict_value = Py_BuildValue ("y", value); /* Python 3: bytes */
#else
/* key */
dict_key = Py_BuildValue ("s", key); /* Python 2: str */
/* value */
dict_value = Py_BuildValue ("s", value); /* Python 2: str */
#endif
PyDict_SetItem (dict, dict_key, dict_value);
if (dict_key && dict_value)
PyDict_SetItem (dict, dict_key, dict_value);
Py_DECREF (dict_key);
Py_DECREF (dict_value);
if (dict_key)
Py_DECREF (dict_key);
if (dict_value)
Py_DECREF (dict_value);
}
/*