diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-26 11:36:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 11:36:48 -0400 |
| commit | bcb74c2c781405149af99f66ce61b1a8f63771fd (patch) | |
| tree | 2b763758dc0784b801efd8eb159eb92db6520c6c /backend/x11 | |
| parent | 5617a595981a10ec2e7d5d4808b3201bcf35f44e (diff) | |
| parent | c7f8b28d8d48a9857659ad73935a3b513e588d4c (diff) | |
Merge pull request #749 from psychon/fix_x11_use_after_free
Fix use-after-free in x11 backend during shutdown
Diffstat (limited to 'backend/x11')
| -rw-r--r-- | backend/x11/backend.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index dd2c0a6e..36d72d9e 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -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; |