rules: Ensure same number of layouts and variants

xkbcommon · Sep 25, 2024 · 93244b1 · 93244b1
1 parent 88ae235
commit 93244b1
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/xkbcomp/rules.c b/src/xkbcomp/rules.c
@@ -325,6 +325,23 @@ matcher_new(struct xkb_context *ctx,
     m->rmlvo.variants = split_comma_separated_mlvo(rmlvo->variant);
     m->rmlvo.options = split_comma_separated_mlvo(rmlvo->options);
 
+    if (darray_size(m->rmlvo.layouts) > darray_size(m->rmlvo.variants)) {
+        /* Do not warn if no variants was provided */
+        if (!isempty(rmlvo->variant))
+            log_warn(ctx, XKB_LOG_MESSAGE_NO_ID,
+                     "More layouts than variants: \"%s\" vs. \"%s\".\n",
+                     rmlvo->layout ? rmlvo->layout : "(none)",
+                     rmlvo->variant ? rmlvo->variant : "(none)");
+        darray_resize0(m->rmlvo.variants, darray_size(m->rmlvo.layouts));
+    } else if (darray_size(m->rmlvo.layouts) < darray_size(m->rmlvo.variants)) {
+        log_err(ctx, XKB_LOG_MESSAGE_NO_ID,
+                "Less layouts than variants: \"%s\" vs. \"%s\".\n",
+                rmlvo->layout ? rmlvo->layout : "(none)",
+                rmlvo->variant ? rmlvo->variant : "(none)");
+        darray_resize(m->rmlvo.variants, darray_size(m->rmlvo.layouts));
+        darray_shrink(m->rmlvo.variants);
+    }
+
     return m;
 }