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

xkb: fix some possible memleaks in XkbGetKbdByName 

GetComponentByName returns an allocated string, so let's free that if we
fail somewhere.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 18f91b950e)
This commit is contained in:
Peter Hutterer 2022-07-13 11:23:09 +10:00 committed by Olivier Fourdan
parent 5dbb2b52cf
commit 69ab3bcaa0
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xkb/xkb.c
View File

@ -5940,18 +5940,32 @@ ProcXkbGetKbdByName(ClientPtr client)
xkb = dev->key->xkbInfo->desc; xkb = dev->key->xkbInfo->desc;
status = Success; status = Success;
str = (unsigned char *) &stuff[1]; str = (unsigned char *) &stuff[1];
if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ {
char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */
if (keymap) {
free(keymap);
return BadMatch; return BadMatch;
}
}
names.keycodes = GetComponentSpec(&str, TRUE, &status); names.keycodes = GetComponentSpec(&str, TRUE, &status);
names.types = GetComponentSpec(&str, TRUE, &status); names.types = GetComponentSpec(&str, TRUE, &status);
names.compat = GetComponentSpec(&str, TRUE, &status); names.compat = GetComponentSpec(&str, TRUE, &status);
names.symbols = GetComponentSpec(&str, TRUE, &status); names.symbols = GetComponentSpec(&str, TRUE, &status);
names.geometry = GetComponentSpec(&str, TRUE, &status); names.geometry = GetComponentSpec(&str, TRUE, &status);
if (status != Success) if (status == Success) {
return status;
len = str - ((unsigned char *) stuff); len = str - ((unsigned char *) stuff);
if ((XkbPaddedSize(len) / 4) != stuff->length) if ((XkbPaddedSize(len) / 4) != stuff->length)
return BadLength; status = BadLength;
}
if (status != Success) {
free(names.keycodes);
free(names.types);
free(names.compat);
free(names.symbols);
free(names.geometry);
return status;
}
CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask);
CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask);