Bugfix: Some memory leaks / invalid accesses

This commit is contained in:
Michael Stapelberg
2009-03-05 01:48:30 +01:00
parent 17bca23a8c
commit 1343b77dbb
4 changed files with 29 additions and 3 deletions

View File

@ -165,12 +165,18 @@ void initialize_xinerama(xcb_connection_t *conn) {
return;
}
if (!xcb_xinerama_is_active_reply(conn, xcb_xinerama_is_active(conn), NULL)->state) {
xcb_xinerama_is_active_reply_t *reply;
reply = xcb_xinerama_is_active_reply(conn, xcb_xinerama_is_active(conn), NULL);
if (!reply->state) {
printf("Xinerama is not active (in your X-Server), disabling.\n");
free(reply);
disable_xinerama(conn);
return;
}
free(reply);
query_screens(conn, virtual_screens);
i3Screen *s;
@ -253,7 +259,8 @@ void xinerama_requery_screens(xcb_connection_t *conn) {
}
/* Free the old list */
TAILQ_FOREACH(screen, virtual_screens, screens) {
while (!TAILQ_EMPTY(virtual_screens)) {
screen = TAILQ_FIRST(virtual_screens);
TAILQ_REMOVE(virtual_screens, screen, screens);
free(screen);
}