From 901c14c409e6e8143ade06a7478241e558cfb79c Mon Sep 17 00:00:00 2001 From: Calvin Lee Date: Wed, 16 Aug 2017 09:23:21 +0200 Subject: Prevent alloc errors from crashing in `list_t` This commit changes the `list_t` api so that alloc errors can be detected and worked around. Also fixes errors not found in 5cc7342 --- backend/multi/backend.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'backend/multi/backend.c') diff --git a/backend/multi/backend.c b/backend/multi/backend.c index 290b9678..33b26a0a 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -120,6 +120,12 @@ void wlr_multi_backend_add(struct wlr_backend *_multi, wlr_log(L_ERROR, "Could not add backend: allocation failed"); return; } + if (list_add(multi->backends, sub) == -1) { + wlr_log(L_ERROR, "Could not add backend: allocation failed"); + free(sub); + return; + } + sub->backend = backend; sub->container = &multi->backend; @@ -137,8 +143,6 @@ void wlr_multi_backend_add(struct wlr_backend *_multi, wl_signal_add(&backend->events.input_remove, &sub->input_remove); wl_signal_add(&backend->events.output_add, &sub->output_add); wl_signal_add(&backend->events.output_remove, &sub->output_remove); - - list_add(multi->backends, sub); } struct wlr_session *wlr_multi_get_session(struct wlr_backend *_backend) { -- cgit v1.2.3