mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-04-03 04:30:39 +02:00
xkb: Fix serialization of key type without level names
Before this commit the count of key type level names was wrongly set in `XkbGetNames`: for key type without names, it was set to the level count, while it should be 0: - `XkbComputeGetNamesReplySize()` does not account key type without level names; - `XkbSendNames()` does not write any level entry for key types without level names. This causes a mismatch offset while parsing the response and its processing would ultimately fail. Fixed by setting the correct level name count: 0 if there is no level name, else the number of levels.
This commit is contained in:
parent
9ddaf5b1ee
commit
d97d68f25f
1 changed files with 2 additions and 1 deletions
|
|
@ -3939,7 +3939,8 @@ XkbSendNames(ClientPtr client, XkbDescPtr xkb, xkbGetNamesReply * rep)
|
|||
register CARD32 *atm;
|
||||
|
||||
for (i = 0; i < rep->nTypes; i++, type++) {
|
||||
*desc++ = type->num_levels;
|
||||
/* Either no name or all of them, even empty ones */
|
||||
*desc++ = (type->level_names) ? type->num_levels : 0;
|
||||
}
|
||||
desc += XkbPaddedSize(rep->nTypes) - rep->nTypes;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue