(release/25.1) xkb: Fix serialization of key type without level names#2282
Open
metux wants to merge 1 commit intorelease/25.1from
Open
Conversation
metux
pushed a commit
that referenced
this pull request
Apr 18, 2026
metux
force-pushed
the
pr/xkb-fix-serialization-of-key-type-without-level-names-_2026-04-18_19-50-20
branch
from
d97097c to
8bf5297
Compare
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. Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2082> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 levelcount, while it should be 0:
XkbComputeGetNamesReplySize()does not account key type withoutlevel names;
XkbSendNames()does not write any level entry for key types withoutlevel 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.
Part-of: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2082