diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-03-22 17:28:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 17:28:37 -0400 |
| commit | 00bb9de29b154970ac76646d2e8db5fc2eda37f9 (patch) | |
| tree | 90134db94aa17a09335465451c145c9b28be9dd0 /backend/x11/backend.c | |
| parent | ff2e08aa7481517d0bd4379ff0d0b51098f72064 (diff) | |
| parent | e86cd4dc33e495c2e5cacd319ba75984ea19a868 (diff) | |
Merge pull request #727 from martinetd/x11_wl_backend_fixes
Address sanitizer fixes
Diffstat (limited to 'backend/x11/backend.c')
| -rw-r--r-- | backend/x11/backend.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index cb29e518..dd2c0a6e 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -143,6 +143,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e }; wlr_signal_emit_safe(&x11->pointer.events.motion_absolute, &abs); + free(pointer); break; } case XCB_CLIENT_MESSAGE: { @@ -317,12 +318,20 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) { wlr_signal_emit_safe(&backend->events.destroy, backend); + if (x11->event_source) { + wl_event_source_remove(x11->event_source); + } wl_list_remove(&x11->display_destroy.link); wl_event_source_remove(x11->frame_timer); wlr_egl_finish(&x11->egl); - xcb_disconnect(x11->xcb_conn); + if (x11->xcb_conn) { + xcb_disconnect(x11->xcb_conn); + } + if (x11->xlib_conn) { + XCloseDisplay(x11->xlib_conn); + } free(x11); } |