summaryrefslogtreecommitdiff
path: root/xserver/os
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2014-12-21 11:41:46 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2014-12-21 11:41:46 +0000
commit90f0f73a15e225715afae6cb7a8461ba5137b4e6 (patch)
tree052d64a29bd1787128a48f986fd32912631c734f /xserver/os
parent6c8ac3e0cf749ffaeeff0f832716494f459e9b6d (diff)
Update to xorg-server 1.16.3.
Most of the 1.16.2->1.16.3 changes are the security patches that where already there. This adds some extra fixes plus a few unrelated bug fixes.
Diffstat (limited to 'xserver/os')
-rw-r--r--xserver/os/access.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xserver/os/access.c b/xserver/os/access.c
index e5a067220..61624fdf7 100644
--- a/xserver/os/access.c
+++ b/xserver/os/access.c
@@ -1335,7 +1335,7 @@ GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
}
for (host = validhosts; host; host = host->next) {
len = host->len;
- if ((ptr + sizeof(xHostEntry) + len) > (data + n))
+ if ((ptr + sizeof(xHostEntry) + len) > ((unsigned char *) *data + n))
break;
((xHostEntry *) ptr)->family = host->family;
((xHostEntry *) ptr)->length = len;