diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-11-01 16:28:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 16:28:08 -0400 |
| commit | 63a46c6550cd43c528148391a8cbe20112361166 (patch) | |
| tree | b8120d18ba5c70b8b9639f257b64314e4d75338b | |
| parent | 4f73498b78645728ff23adfbf9b650a1b66b66bb (diff) | |
| parent | b53db8c39e33c340214827097e26ccacbbcb5c08 (diff) | |
Merge pull request #379 from martinetd/shutdown_asan
Shutdown ASAN fixes
| -rw-r--r-- | backend/libinput/backend.c | 1 | ||||
| -rw-r--r-- | backend/multi/backend.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 07c6da13..45b4e368 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -105,6 +105,7 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) { wl_signal_emit(&backend->backend.events.input_remove, wlr_dev); wlr_input_device_destroy(wlr_dev); } + free(wlr_devices); } wlr_list_free(backend->wlr_device_lists); wl_event_source_remove(backend->input_event); diff --git a/backend/multi/backend.c b/backend/multi/backend.c index a7ee648c..c35303e0 100644 --- a/backend/multi/backend.c +++ b/backend/multi/backend.c @@ -30,8 +30,8 @@ static bool multi_backend_start(struct wlr_backend *_backend) { static void multi_backend_destroy(struct wlr_backend *_backend) { struct wlr_multi_backend *backend = (struct wlr_multi_backend *)_backend; - struct subbackend_state *sub; - wl_list_for_each(sub, &backend->backends, link) { + struct subbackend_state *sub, *next; + wl_list_for_each_safe(sub, next, &backend->backends, link) { wlr_backend_destroy(sub->backend); free(sub); } |