summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-05-09 20:05:10 +0100
committerLibravatar GitHub <noreply@github.com>2018-05-09 20:05:10 +0100
commit94cf3f1b17c7e9a6f8d6d107ccb6ae2fc7c7079b (patch)
tree67f4c84722c4af822969fea1ed87897c50cae7b3
parentMerge pull request #1945 from RyanDwyer/fix-title-scissor (diff)
parentFix null deref in server_init (diff)
downloadsway-94cf3f1b17c7e9a6f8d6d107ccb6ae2fc7c7079b.tar.gz
sway-94cf3f1b17c7e9a6f8d6d107ccb6ae2fc7c7079b.tar.zst
sway-94cf3f1b17c7e9a6f8d6d107ccb6ae2fc7c7079b.zip
Merge pull request #1947 from dlrobertson/fix_null_deref
Fix null deref in server_init
-rw-r--r--sway/server.c4
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