From ec25b0a844b8786fd20e107669c516f45372955a Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 24 Aug 2017 16:08:49 +0300 Subject: [PATCH] libweston: assert make/model in weston_output_enable() Output make and model are not allowed to be NULL in the protocol, so ensure they are not forgotten when enabling an output. Signed-off-by: Pekka Paalanen Reviewed-by: Ian Ray Reviewed-by: Daniel Stone Acked-by: Derek Foreman --- libweston/compositor.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libweston/compositor.c b/libweston/compositor.c index 0efd570..547e826 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -5524,6 +5524,7 @@ weston_output_enable(struct weston_output *output) { struct weston_compositor *c = output->compositor; struct weston_output *iterator; + struct weston_head *head; int x = 0, y = 0; if (output->enabled) { @@ -5538,6 +5539,11 @@ weston_output_enable(struct weston_output *output) return -1; } + wl_list_for_each(head, &output->head_list, output_link) { + assert(head->make); + assert(head->model); + } + iterator = container_of(c->output_list.prev, struct weston_output, link); -- 2.7.4