From 7fecb43735b71207210d056874e164e057ce8723 Mon Sep 17 00:00:00 2001 From: Sergi Granell Date: Fri, 24 Mar 2017 20:48:02 +0100 Subject: [PATCH] compositor-wayland: Check the return value of wayland_output_create_common MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If wayland_output_create_common returns NULL, it means that the output creation failed. Signed-off-by: Sergi Granell Reviewed-by: Armin Krezović Reviewed-by: Quentin Glidic --- libweston/compositor-wayland.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c index 2bbf4cf..27beff6 100644 --- a/libweston/compositor-wayland.c +++ b/libweston/compositor-wayland.c @@ -1261,6 +1261,9 @@ wayland_output_create(struct weston_compositor *compositor, const char *name) { struct wayland_output *output = wayland_output_create_common(name); + if (!output) + return -1; + weston_output_init(&output->base, compositor); weston_compositor_add_pending_output(&output->base, compositor); @@ -1319,9 +1322,13 @@ static int wayland_output_create_for_parent_output(struct wayland_backend *b, struct wayland_parent_output *poutput) { - struct wayland_output *output = wayland_output_create_common("wlparent"); + struct wayland_output *output; struct weston_mode *mode; + output = wayland_output_create_common("wlparent"); + if (!output) + return -1; + if (poutput->current_mode) { mode = poutput->current_mode; } else if (poutput->preferred_mode) { @@ -1367,9 +1374,13 @@ out: static int wayland_output_create_fullscreen(struct wayland_backend *b) { - struct wayland_output *output = wayland_output_create_common("wayland-fullscreen"); + struct wayland_output *output; int width = 0, height = 0; + output = wayland_output_create_common("wayland-fullscreen"); + if (!output) + return -1; + weston_output_init(&output->base, b->compositor); output->base.scale = 1; -- 2.7.4