Fix int casts related to XkbWrapGroupIntoRange

Author: wismill

src/keymap-priv.c

@@ -8,6 +8,9 @@
 
 #include "config.h"
 
+#include <assert.h>
+#include <stdint.h>
+
 #include "xkbcommon/xkbcommon-names.h"
 #include "keymap.h"
 
@@ -174,8 +177,9 @@ XkbWrapGroupIntoRange(int32_t group,
          * C99 says a negative dividend in a modulo operation always
          * gives a negative result.
          */
+        static_assert(XKB_MAX_GROUPS < INT32_MAX, "Max groups don't fit");
         if (group < 0)
-            return ((int) num_groups + (group % (int) num_groups));
+            return ((int32_t) num_groups + (group % (int32_t) num_groups));
         else
             return group % num_groups;
     }

src/keymap.c

@@ -13,6 +13,9 @@
 
 #include "config.h"
 
+#include <assert.h>
+#include <stdint.h>
+
 #include "keymap.h"
 #include "text.h"
 
@@ -35,7 +38,7 @@ xkb_keymap_unref(struct xkb_keymap *keymap)
             if (key->groups) {
                 for (unsigned i = 0; i < key->num_groups; i++) {
                     if (key->groups[i].levels) {
-                        for (unsigned j = 0; j < XkbKeyNumLevels(key, i); j++) {
+                        for (xkb_level_index_t j = 0; j < XkbKeyNumLevels(key, i); j++) {
                             if (key->groups[i].levels[j].num_syms > 1)
                                 free(key->groups[i].levels[j].s.syms);
                             if (key->groups[i].levels[j].num_actions > 1)
@@ -336,7 +339,8 @@ xkb_keymap_num_levels_for_key(struct xkb_keymap *keymap, xkb_keycode_t kc,
     if (!key)
         return 0;
 
-    layout = XkbWrapGroupIntoRange(layout, key->num_groups,
+    static_assert(XKB_MAX_GROUPS < INT32_MAX, "Max groups don't fit");
+    layout = XkbWrapGroupIntoRange((int32_t) layout, key->num_groups,
                                    key->out_of_range_group_action,
                                    key->out_of_range_group_number);
     if (layout == XKB_LAYOUT_INVALID)
@@ -398,7 +402,8 @@ xkb_keymap_key_get_mods_for_level(struct xkb_keymap *keymap,
     if (!key)
         return 0;
 
-    layout = XkbWrapGroupIntoRange(layout, key->num_groups,
+    static_assert(XKB_MAX_GROUPS < INT32_MAX, "Max groups don't fit");
+    layout = XkbWrapGroupIntoRange((int32_t) layout, key->num_groups,
                                    key->out_of_range_group_action,
                                    key->out_of_range_group_number);
     if (layout == XKB_LAYOUT_INVALID)
@@ -461,7 +466,8 @@ xkb_keymap_key_get_syms_by_level(struct xkb_keymap *keymap,
     if (!key)
         goto err;
 
-    layout = XkbWrapGroupIntoRange(layout, key->num_groups,
+    static_assert(XKB_MAX_GROUPS < INT32_MAX, "Max groups don't fit");
+    layout = XkbWrapGroupIntoRange((int32_t) layout, key->num_groups,
                                    key->out_of_range_group_action,
                                    key->out_of_range_group_number);
     if (layout == XKB_LAYOUT_INVALID)

src/state.c

@@ -22,6 +22,9 @@
 
 #include "config.h"
 
+#include <assert.h>
+#include <stdint.h>
+
 #include "keymap.h"
 #include "keysym.h"
 #include "utf8.h"
@@ -132,7 +135,9 @@ xkb_state_key_get_layout(struct xkb_state *state, xkb_keycode_t kc)
     if (!key)
         return XKB_LAYOUT_INVALID;
 
-    return XkbWrapGroupIntoRange(state->components.group, key->num_groups,
+    static_assert(XKB_MAX_GROUPS < INT32_MAX, "Max groups don't fit");
+    return XkbWrapGroupIntoRange((int32_t) state->components.group,
+                                 key->num_groups,
                                  key->out_of_range_group_action,
                                  key->out_of_range_group_number);
 }