From 066f669d8d92b374f8d383e1663b157b3ba72c59 Mon Sep 17 00:00:00 2001 From: Silva Alejandro Ismael Date: Fri, 31 May 2019 16:39:43 -0300 Subject: [PATCH] compositor: fix segfaults if wl_display_create fails Added check to log the error if wl_display_create return NULL. Fixes: #101 Signed-off-by: Silva Alejandro Ismael (cherry picked from commit 21a1f40760f2da174fa52399fa0d9a8c1f772e68) --- compositor/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compositor/main.c b/compositor/main.c index c32067831..be9580833 100644 --- a/compositor/main.c +++ b/compositor/main.c @@ -2974,6 +2974,10 @@ int main(int argc, char *argv[]) verify_xdg_runtime_dir(); display = wl_display_create(); + if (display == NULL) { + weston_log("fatal: failed to create display\n"); + goto out_display; + } loop = wl_display_get_event_loop(display); signals[0] = wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, @@ -3169,6 +3173,7 @@ out_signals: wl_display_destroy(display); +out_display: weston_log_file_close(); if (config)