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

Bugfix: Correctly re-assign dock_clients to the first screen when their screen disappears 

This could lead to a null-pointer dereference when closing dock
clients that got lost.
This commit is contained in:
Michael Stapelberg 2009-10-28 15:37:34 +01:00
parent f9d155341e
commit 16d33ec9df
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/xinerama.c
View File

@ -333,6 +333,7 @@ void xinerama_requery_screens(xcb_connection_t *conn) {
/* Copy the list head for the dock clients */ /* Copy the list head for the dock clients */
screen->dock_clients = old_screen->dock_clients; screen->dock_clients = old_screen->dock_clients;
SLIST_INIT(&(old_screen->dock_clients));
/* Update the dimensions */ /* Update the dimensions */
Workspace *ws; Workspace *ws;
@ -364,6 +365,27 @@ void xinerama_requery_screens(xcb_connection_t *conn) {
screen_count++; screen_count++;
} }
/* check for dock_clients which are out of bounds */
TAILQ_FOREACH(old_screen, virtual_screens, screens) {
if (SLIST_EMPTY(&(old_screen->dock_clients)))
continue;
LOG("dock_clients out of bounds at screen %p, reassigning\n", old_screen);
if (SLIST_EMPTY(&(first->dock_clients))) {
first->dock_clients = old_screen->dock_clients;
continue;
}
/* We need to merge the lists */
Client *dock_client;
while (!SLIST_EMPTY(&(old_screen->dock_clients))) {
dock_client = SLIST_FIRST(&(old_screen->dock_clients));
SLIST_INSERT_HEAD(&(first->dock_clients), dock_client, dock_clients);
SLIST_REMOVE_HEAD(&(old_screen->dock_clients), dock_clients);
}
}
/* Check for workspaces which are out of bounds */ /* Check for workspaces which are out of bounds */
TAILQ_FOREACH(ws, workspaces, workspaces) { TAILQ_FOREACH(ws, workspaces, workspaces) {
if (ws->reassigned) if (ws->reassigned)