Merge branch 'obsd-master'

Conflicts:
	Makefile
This commit is contained in:
Thomas Adam
2015-02-14 23:54:07 +00:00
7 changed files with 31 additions and 65 deletions

View File

@ -262,7 +262,7 @@ window_find_by_id(u_int id)
for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
w = ARRAY_ITEM(&windows, i);
if (w->id == id)
if (w != NULL && w->id == id)
return (w);
}
return (NULL);