From f2c4b80620337e8533ce0986186cc914d45b6dce Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 21 Oct 2017 13:25:39 +0200 Subject: Remove calls to assert to check runtime errors in rootston --- rootston/desktop.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'rootston/desktop.c') diff --git a/rootston/desktop.c b/rootston/desktop.c index bf556131..70767f92 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -202,11 +202,18 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly, struct roots_desktop *desktop_create(struct roots_server *server, struct roots_config *config) { - struct roots_desktop *desktop = calloc(1, sizeof(struct roots_desktop)); - assert(desktop); wlr_log(L_DEBUG, "Initializing roots desktop"); - assert(desktop->views = list_create()); + struct roots_desktop *desktop = calloc(1, sizeof(struct roots_desktop)); + if (desktop == NULL) { + return NULL; + } + + desktop->views = list_create(); + if (desktop->views == NULL) { + free(desktop); + return NULL; + } wl_list_init(&desktop->outputs); desktop->output_add.notify = output_add_notify; -- cgit v1.2.3