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

Bugfix: Don’t crash when programs set NULL hints (xev(1) for example) 

This only happened if you had some assignment configured
This commit is contained in:
Michael Stapelberg 2009-06-19 11:05:00 +02:00
parent 1c02ddb4a7
commit a2a8cd85d6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.c
View File

@ -115,7 +115,7 @@ void client_kill(xcb_connection_t *conn, Client *window) {
bool client_matches_class_name(Client *client, char *to_class, char *to_title, bool client_matches_class_name(Client *client, char *to_class, char *to_title,
char *to_title_ucs, int to_title_ucs_len) { char *to_title_ucs, int to_title_ucs_len) {
/* Check if the given class is part of the window class */ /* Check if the given class is part of the window class */
if (strcasestr(client->window_class, to_class) == NULL) if (client->window_class == NULL || strcasestr(client->window_class, to_class) == NULL)
return false; return false;
/* If no title was given, we’re done */ /* If no title was given, we’re done */
@ -124,11 +124,11 @@ bool client_matches_class_name(Client *client, char *to_class, char *to_title,
if (client->name_len > -1) { if (client->name_len > -1) {
/* UCS-2 converted window titles */ /* UCS-2 converted window titles */
if (memmem(client->name, (client->name_len * 2), to_title_ucs, (to_title_ucs_len * 2)) == NULL) if (client->name == NULL || memmem(client->name, (client->name_len * 2), to_title_ucs, (to_title_ucs_len * 2)) == NULL)
return false; return false;
} else { } else {
/* Legacy hints */ /* Legacy hints */
if (strcasestr(client->name, to_title) == NULL) if (client->name == NULL || strcasestr(client->name, to_title) == NULL)
return false; return false;
} }