SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix segfault 

https://github.com/hexchat/hexchat/issues/2265
This commit is contained in:
SoniEx2 2018-11-01 21:39:29 -03:00
parent af0aa7904a
commit c725dd7814
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/plugin.c
View File

@ -541,10 +541,13 @@ static int
plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[], plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[],
hexchat_event_attrs *attrs, int type) hexchat_event_attrs *attrs, int type)
{ {
/* fix segfault https://github.com/hexchat/hexchat/issues/2265 */
static int depth = 0;
GSList *list, *next; GSList *list, *next;
hexchat_hook *hook; hexchat_hook *hook;
int ret, eat = 0; int ret, eat = 0;
depth++;
list = hook_list; list = hook_list;
while (1) while (1)
{ {
@ -590,18 +593,22 @@ plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[],
} }
xit: xit:
/* really remove deleted hooks now */ depth--;
list = hook_list; if (!depth)
while (list)
{ {
hook = list->data; /* really remove deleted hooks now */
next = list->next; list = hook_list;
if (!hook || hook->type == HOOK_DELETED) while (list)
{ {
hook_list = g_slist_remove (hook_list, hook); hook = list->data;
g_free (hook); next = list->next;
if (!hook || hook->type == HOOK_DELETED)
{
hook_list = g_slist_remove (hook_list, hook);
g_free (hook);
}
list = next;
} }
list = next;
} }
return eat; return eat;