blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x11 backend init: fix leak on failed XOpenDisplay 

Found through static analysis
This commit is contained in:
Dominique Martinet 2018-06-30 10:17:36 +09:00
parent 4f7b1382d4
commit bcc2c64c1e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/x11/backend.c
View File

@ -245,13 +245,13 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
x11->xlib_conn = XOpenDisplay(x11_display); x11->xlib_conn = XOpenDisplay(x11_display);
if (!x11->xlib_conn) { if (!x11->xlib_conn) {
wlr_log(L_ERROR, "Failed to open X connection"); wlr_log(L_ERROR, "Failed to open X connection");
return NULL; goto error_x11;
} }
x11->xcb_conn = XGetXCBConnection(x11->xlib_conn); x11->xcb_conn = XGetXCBConnection(x11->xlib_conn);
if (!x11->xcb_conn || xcb_connection_has_error(x11->xcb_conn)) { if (!x11->xcb_conn || xcb_connection_has_error(x11->xcb_conn)) {
wlr_log(L_ERROR, "Failed to open xcb connection"); wlr_log(L_ERROR, "Failed to open xcb connection");
goto error_x11; goto error_display;
} }
XSetEventQueueOwner(x11->xlib_conn, XCBOwnsEventQueue); XSetEventQueueOwner(x11->xlib_conn, XCBOwnsEventQueue);
@ -262,7 +262,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
x11->event_source = wl_event_loop_add_fd(ev, fd, events, x11_event, x11); x11->event_source = wl_event_loop_add_fd(ev, fd, events, x11_event, x11);
if (!x11->event_source) { if (!x11->event_source) {
wlr_log(L_ERROR, "Could not create event source"); wlr_log(L_ERROR, "Could not create event source");
goto error_x11; goto error_display;
} }
x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data; x11->screen = xcb_setup_roots_iterator(xcb_get_setup(x11->xcb_conn)).data;
@ -291,8 +291,9 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
error_event: error_event:
wl_event_source_remove(x11->event_source); wl_event_source_remove(x11->event_source);
error_x11: error_display:
XCloseDisplay(x11->xlib_conn); XCloseDisplay(x11->xlib_conn);
error_x11:
free(x11); free(x11);
return NULL; return NULL;
} }