qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix X11 property retrieval code

Browse Source 
Just stop when reaching the end of property list instead of reading
forever past its end.

Issue was introduced in my previous commit and reported by deraadt@
This commit is contained in:
czarkoff 2016-11-08 13:22:55 +00:00
parent 82d2f016de
commit 7b0a63b485
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/video/video.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: video.c,v 1.21 2016/10/21 09:48:48 czarkoff Exp $ */
/* $OpenBSD: video.c,v 1.22 2016/11/08 13:22:55 czarkoff Exp $ */
/*
* Copyright (c) 2010 Jacob Meuser <jakemsr@openbsd.org>
*
@ -508,17 +508,22 @@ net_wm_supported(struct video *vid)
Atom query, fullscreen;
Atom type;
Atom *data;
long off;
int fmt, len = 12;
long off = 0, len = 12;
int fmt;
unsigned long nitems, remain;
int i;
query = XInternAtom(x->dpy, "_NET_SUPPORTED", True);
fullscreen = XInternAtom(x->dpy, "_NET_WM_STATE_FULLSCREEN", True);
if (query == None || fullscreen == None)
return;
do {
if (XGetWindowProperty(x->dpy, x->rwin, query, off, len,
False, XA_ATOM, &type, &fmt, &nitems, &remain,
(unsigned char **)&data) != Success)
return;
for (off = 0; XGetWindowProperty(x->dpy, x->rwin, query, off,
len, False, XA_ATOM, &type, &fmt, &nitems, &remain,
(unsigned char **)&data) == Success; off += len) {
if (type == XA_ATOM && fmt == 32) {
for (i = 0; i < nitems; i++) {
if (data[i] == fullscreen) {
@ -529,7 +534,9 @@ net_wm_supported(struct video *vid)
}
}
XFree(data);
}
off += len;
} while (remain > 0);
return;
}