nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix memory leak: use xcb_disconnect() instead of free()

This commit is contained in:
Michael Stapelberg 2016-01-09 17:05:40 +01:00
parent 8bfc651dd1
commit 17c55792c6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/restore_layout.c
View File

@ -98,7 +98,11 @@ void restore_connect(void) {
free(state); free(state);
} }
free(restore_conn); /* xcb_disconnect leaks memory in libxcb versions earlier than 1.11,
* but it’s the right function to call. See
* http://cgit.freedesktop.org/xcb/libxcb/commit/src/xcb_conn.c?id=4dcbfd77b
*/
xcb_disconnect(restore_conn);
free(xcb_watcher); free(xcb_watcher);
free(xcb_check); free(xcb_check);
free(xcb_prepare); free(xcb_prepare);
@ -106,8 +110,12 @@ void restore_connect(void) {
int screen; int screen;
restore_conn = xcb_connect(NULL, &screen); restore_conn = xcb_connect(NULL, &screen);
if (restore_conn == NULL || xcb_connection_has_error(restore_conn)) if (restore_conn == NULL || xcb_connection_has_error(restore_conn)) {
if (restore_conn != NULL) {
xcb_disconnect(restore_conn);
}
errx(EXIT_FAILURE, "Cannot open display\n"); errx(EXIT_FAILURE, "Cannot open display\n");
}
xcb_watcher = scalloc(1, sizeof(struct ev_io)); xcb_watcher = scalloc(1, sizeof(struct ev_io));
xcb_check = scalloc(1, sizeof(struct ev_check)); xcb_check = scalloc(1, sizeof(struct ev_check));