You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
diff --git a/include/dix.h b/include/dix.h
|
|
index 21176a8..921156b 100644
|
|
--- a/include/dix.h
|
|
+++ b/include/dix.h
|
|
@@ -80,7 +80,7 @@ SOFTWARE.
|
|
|
|
#define REQUEST_FIXED_SIZE(req, n)\
|
|
if (((sizeof(req) >> 2) > client->req_len) || \
|
|
- ((n >> 2) >= client->req_len) || \
|
|
+ (((n) >> 2) >= client->req_len) || \
|
|
((((uint64_t) sizeof(req) + (n) + 3) >> 2) != (uint64_t) client->req_len)) \
|
|
return(BadLength)
|
|
|
|
diff --git a/os/access.c b/os/access.c
|
|
index f393c8d..28f2d32 100644
|
|
--- a/os/access.c
|
|
+++ b/os/access.c
|
|
@@ -1308,7 +1308,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;
|