Compare commits

...

2 Commits

2 changed files with 22 additions and 9 deletions

View File

@ -404,6 +404,12 @@ static int api_hexchat_hook_print(lua_State *L)
lua_pushvalue(L, 2);
ref = luaL_ref(L, LUA_REGISTRYINDEX);
pri = luaL_optinteger(L, 3, HEXCHAT_PRI_NORM);
/* we rely on Close Context pri=INT_MIN for internal stuff. this avoids issues. */
if (pri == INT_MIN && strcmp(event, "Close Context"))
{
hexchat_print(ph, "Warning: Attempted to hook Close Context with priority INT_MIN. Adjusting to INT_MIN+1.");
pri = INT_MIN + 1;
}
info = g_new(hook_info, 1);
info->state = L;
info->ref = ref;

View File

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