From 369c6a806554429798b531cbf4267d8c8fcf6ed1 Mon Sep 17 00:00:00 2001
From: Pierre Le Marre <dev@wismill.eu>
Date: Tue, 14 Oct 2025 22:53:06 +0200
Subject: [PATCH] xkb: Fix key type level names

Fixed invalid level names count for key types without level names.

Signed-off-by: Pierre Le Marre <dev@wismill.eu>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/292>
---
 src/xkb/XKBNames.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xkb/XKBNames.c b/src/xkb/XKBNames.c
index 0ea1c827..060349c9 100644
--- a/src/xkb/XKBNames.c
+++ b/src/xkb/XKBNames.c
@@ -501,7 +501,7 @@ XkbSetNames(Display *dpy,
         BufAlloc(char *, tmp, XkbPaddedSize(nLvlTypes));
         type = &xkb->map->types[firstLvlType];
         for (i = 0; i < nLvlTypes; i++, type++) {
-            *tmp++ = type->num_levels;
+            *tmp++ = (type->level_names == NULL) ? 0 : type->num_levels;
         }
         type = &xkb->map->types[firstLvlType];
         for (i = 0; i < nLvlTypes; i++, type++) {