mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: fix crash on never used output's tear-down

Browse Source 
weston_output_enable() initializes the list, but weston_output_release()
maybe be called even if the output was never enabled, triggering the
assert due to uninitialized (actually NULL) list head.

This can be triggered with a bad weston.ini, for example using an
invalid output transform value.

Check in weston_output_disable() instead, but because it too may be
called for non-enabled output, only if it was actually enabled.

Fixes: 1a4f87dec5
	"libweston: introduce weston_paint_node"

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2021-06-09 16:14:45 +03:00
parent 0750ceae6c
commit 2ec15ebf3f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor.c
+4 -3
View File
@@ -6719,9 +6719,12 @@ weston_output_disable(struct weston_output *output)
if (output->disable(output) < 0) if (output->disable(output) < 0)
return; return;
if (output->enabled) if (output->enabled) {
weston_compositor_remove_output(output); weston_compositor_remove_output(output);
assert(wl_list_empty(&output->paint_node_list));
}
output->destroying = 0; output->destroying = 0;
} }
@@ -6816,8 +6819,6 @@ weston_output_release(struct weston_output *output)
if (output->enabled) if (output->enabled)
weston_compositor_remove_output(output); weston_compositor_remove_output(output);
assert(wl_list_empty(&output->paint_node_list));
pixman_region32_fini(&output->region); pixman_region32_fini(&output->region);
wl_list_remove(&output->link); wl_list_remove(&output->link);