Xi: Silence some tautological warnings
xichangehierarchy.c:424:23: warning: comparison of constant 536870911 with expression of type 'uint16_t' (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare,Semantic Issue] if (stuff->length > (INT_MAX >> 2)) ~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ xichangehierarchy.c:438:26: warning: comparison of constant 536870911 with expression of type 'uint16_t' (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare,Semantic Issue] if ((any->length > (INT_MAX >> 2)) || (len < (any->length << 2))) ~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
113c0bb4fd
commit
ee06f674bb
|
@ -421,9 +421,7 @@ ProcXIChangeHierarchy(ClientPtr client)
|
||||||
if (!stuff->num_changes)
|
if (!stuff->num_changes)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
if (stuff->length > (INT_MAX >> 2))
|
len = ((size_t)stuff->length << 2) - sizeof(xXIAnyHierarchyChangeInfo);
|
||||||
return BadAlloc;
|
|
||||||
len = (stuff->length << 2) - sizeof(xXIAnyHierarchyChangeInfo);
|
|
||||||
|
|
||||||
any = (xXIAnyHierarchyChangeInfo *) &stuff[1];
|
any = (xXIAnyHierarchyChangeInfo *) &stuff[1];
|
||||||
while (stuff->num_changes--) {
|
while (stuff->num_changes--) {
|
||||||
|
@ -435,7 +433,7 @@ ProcXIChangeHierarchy(ClientPtr client)
|
||||||
SWAPIF(swaps(&any->type));
|
SWAPIF(swaps(&any->type));
|
||||||
SWAPIF(swaps(&any->length));
|
SWAPIF(swaps(&any->length));
|
||||||
|
|
||||||
if ((any->length > (INT_MAX >> 2)) || (len < (any->length << 2)))
|
if (len < ((size_t)any->length << 2))
|
||||||
return BadLength;
|
return BadLength;
|
||||||
|
|
||||||
#define CHANGE_SIZE_MATCH(type) \
|
#define CHANGE_SIZE_MATCH(type) \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user