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.

(cherry picked from commit c49cbc176a)

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2146>
This commit is contained in:
Pierre Le Marre 2025-10-16 07:06:38 +02:00 committed by Marge Bot
parent bdc7eb8f07
commit 5ebf0a9dd7

View file

@ -3949,7 +3949,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;