mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
xkb: Avoid length-check failure on empty strings.
_XkbCheckRequestBounds assumes that from..to is at least one byte. However, request strings can be empty, causing spurious failures in XkbGetKbdByName calls. To avoid this, before checking bounds make sure that the length is nonzero.
This commit is contained in:
committed by
FeepingCreature
parent
d23e446558
commit
79c572fbd3
@@ -5817,11 +5817,11 @@ GetComponentSpec(ClientPtr client, xkbGetKbdByNameReq *stuff,
|
||||
return NULL;
|
||||
}
|
||||
len = (*(unsigned char *) wire++);
|
||||
if (!_XkbCheckRequestBounds(client, stuff, wire, wire + len)) {
|
||||
*errRtrn = BadLength;
|
||||
return NULL;
|
||||
}
|
||||
if (len > 0) {
|
||||
if (!_XkbCheckRequestBounds(client, stuff, wire, wire + len)) {
|
||||
*errRtrn = BadLength;
|
||||
return NULL;
|
||||
}
|
||||
str = calloc(1, len + 1);
|
||||
if (str) {
|
||||
tmp = str;
|
||||
|
||||
Reference in New Issue
Block a user