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

api: fix use of pointer after free in function key_unbind

Browse Source
This commit is contained in:
Sébastien Helleu 2020-06-07 09:11:24 +02:00
parent f52c706ee0
commit e784a994b5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -58,6 +58,7 @@ Bug fixes::
* core: fix WEECHAT_SHAREDIR with CMake build (issue #1461)
* core: fix memory leak in calculation of expression on FreeBSD (issue #1469)
* core: fix resize of a bar when its size is 0 (automatic) (issue #1470)
* api: fix use of pointer after free in function key_unbind
* api: replace plugin and buffer name by buffer pointer in argument "modifier_data" sent to weechat_print modifier callback (issue #42)
* exec: fix use of same task id for different tasks (issue #1491)
* fifo: fix errors when writing in the FIFO pipe (issue #713)

9
src/gui/gui-key.c
View File

@ -921,7 +921,7 @@ gui_key_unbind_plugin (const char *context, const char *key)
{
int ctxt, num_keys, area_type;
char *area_name;
struct t_gui_key *ptr_key;
struct t_gui_key *ptr_key, *ptr_next_key;
ctxt = gui_key_search_context (context);
if (ctxt < 0)
@ -944,8 +944,11 @@ gui_key_unbind_plugin (const char *context, const char *key)
gui_key_set_area_type_name (key + 5, &area_type, &area_name);
if (area_name)
{
for (ptr_key = gui_keys[ctxt]; ptr_key; ptr_key = ptr_key->next_key)
ptr_key = gui_keys[ctxt];
while (ptr_key)
{
ptr_next_key = ptr_key->next_key;
if (((ptr_key->area_type[0] == area_type)
&& ptr_key->area_name[0]
&& (strcmp (ptr_key->area_name[0], area_name) == 0))
@ -955,6 +958,8 @@ gui_key_unbind_plugin (const char *context, const char *key)
{
num_keys += gui_key_unbind (NULL, ctxt, ptr_key->key);
}
ptr_key = ptr_next_key;
}
free (area_name);
}