diff options
author | Dan Robertson <danlrobertson89@gmail.com> | 2018-05-09 16:32:55 +0000 |
---|---|---|
committer | Dan Robertson <danlrobertson89@gmail.com> | 2018-05-09 16:32:55 +0000 |
commit | 4ebd6f35070ba5a9a84f279dbe854613f415d468 (patch) | |
tree | 67f4c84722c4af822969fea1ed87897c50cae7b3 | |
parent | Merge pull request #1945 from RyanDwyer/fix-title-scissor (diff) | |
download | sway-4ebd6f35070ba5a9a84f279dbe854613f415d468.tar.gz sway-4ebd6f35070ba5a9a84f279dbe854613f415d468.tar.zst sway-4ebd6f35070ba5a9a84f279dbe854613f415d468.zip |
Fix null deref in server_init
If the backend fails to be created, log an error and immidiately return
from server_init.
-rw-r--r-- | sway/server.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/server.c b/sway/server.c index 2793ca70..8c41ee87 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -48,6 +48,10 @@ bool server_init(struct sway_server *server) { | |||
48 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 48 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
49 | server->backend = wlr_backend_autocreate(server->wl_display); | 49 | server->backend = wlr_backend_autocreate(server->wl_display); |
50 | 50 | ||
51 | if (!server->backend) { | ||
52 | wlr_log(L_ERROR, "Unable to create backend"); | ||
53 | return false; | ||
54 | } | ||
51 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); | 55 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); |
52 | assert(renderer); | 56 | assert(renderer); |
53 | 57 | ||