Merge pull request #749 from psychon/fix_x11_use_after_free

Fix use-after-free in x11 backend during shutdown
This commit is contained in:
Drew DeVault 2018-03-26 11:36:48 -04:00 committed by GitHub
commit bcb74c2c78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -326,9 +326,6 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) {
wl_event_source_remove(x11->frame_timer);
wlr_egl_finish(&x11->egl);
if (x11->xcb_conn) {
xcb_disconnect(x11->xcb_conn);
}
if (x11->xlib_conn) {
XCloseDisplay(x11->xlib_conn);
}
@ -428,7 +425,6 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
error_event:
wl_event_source_remove(x11->event_source);
error_x11:
xcb_disconnect(x11->xcb_conn);
XCloseDisplay(x11->xlib_conn);
free(x11);
return NULL;