mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'safer-addons' into 'master'

Browse source 
util/addon: make wlr_addon_set_finish() safer

See merge request wlroots/wlroots!4379
This commit is contained in:
Kirill Primak 2023-10-08 11:06:14 +00:00
commit b9535c7239
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
util/addon.c
View file

@ -11,16 +11,16 @@ void wlr_addon_set_init(struct wlr_addon_set *set) {
} }
void wlr_addon_set_finish(struct wlr_addon_set *set) { void wlr_addon_set_finish(struct wlr_addon_set *set) {
struct wlr_addon *addon, *tmp; while (!wl_list_empty(&set->addons)) {
wl_list_for_each_safe(addon, tmp, &set->addons, link) { struct wl_list *link = set->addons.next;
struct wlr_addon *addon = wl_container_of(link, addon, link);
const struct wlr_addon_interface *impl = addon->impl;
addon->impl->destroy(addon); addon->impl->destroy(addon);
if (set->addons.next == link) {
wlr_log(WLR_ERROR, "Dangling addon: %s", impl->name);
abort();
} }
wl_list_for_each(addon, &set->addons, link) {
wlr_log(WLR_ERROR, "Dangling addon: %s", addon->impl->name);
} }
assert(wl_list_empty(&set->addons));
} }
void wlr_addon_init(struct wlr_addon *addon, struct wlr_addon_set *set, void wlr_addon_init(struct wlr_addon *addon, struct wlr_addon_set *set,