frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
FeepingCreature 2022-08-20 20:12:31 +02:00 committed by FeepingCreature
parent d23e446558
commit 79c572fbd3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xkb/xkb.c
View File

@ -5817,11 +5817,11 @@ GetComponentSpec(ClientPtr client, xkbGetKbdByNameReq *stuff,
return NULL; return NULL;
} }
len = (*(unsigned char *) wire++); len = (*(unsigned char *) wire++);
if (len > 0) {
if (!_XkbCheckRequestBounds(client, stuff, wire, wire + len)) { if (!_XkbCheckRequestBounds(client, stuff, wire, wire + len)) {
*errRtrn = BadLength; *errRtrn = BadLength;
return NULL; return NULL;
} }
if (len > 0) {
str = calloc(1, len + 1); str = calloc(1, len + 1);
if (str) { if (str) {
tmp = str; tmp = str;