mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-14 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

hook: zero hooks before adding them

Browse source 
Clear the hook before adding it so that we are sure the removed
callback doesn't contain garbage and cause a crash on disconnect.

Mark the removed and priv fields as private. Make sure to add the
removed callback after adding the hook.

Fixes a crash in kwin
This commit is contained in:
Wim Taymans 2020-11-20 09:40:24 +01:00
parent 4d085816ef
commit fc2b0b20ad
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/include/spa/utils/hook.h
View file

@ -70,7 +70,8 @@ struct spa_interface {
struct spa_hook {
struct spa_list link;
struct spa_callbacks cb;
/** callback and data for the hook list */
/** callback and data for the hook list, private to the
* hook_list implementor */
void (*removed) (struct spa_hook *hook);
void *priv;
};
@ -86,11 +87,12 @@ static inline bool spa_hook_list_is_empty(struct spa_hook_list *list)
return spa_list_is_empty(&list->list);
}
/** Append a hook \memberof spa_hook */
/** Append a hook \memberof spa_hook. */
static inline void spa_hook_list_append(struct spa_hook_list *list,
struct spa_hook *hook,
const void *funcs, void *data)
{
spa_zero(*hook);
hook->cb = SPA_CALLBACKS_INIT(funcs, data);
spa_list_append(&list->list, &hook->link);
}
@ -100,6 +102,7 @@ static inline void spa_hook_list_prepend(struct spa_hook_list *list,
struct spa_hook *hook,
const void *funcs, void *data)
{
spa_zero(*hook);
hook->cb = SPA_CALLBACKS_INIT(funcs, data);
spa_list_prepend(&list->list, &hook->link);
}