From 49a1a12a327e6f78db184e83e8ea805da4477775 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 10 Oct 2024 12:54:53 -0700 Subject: [PATCH] Expand count checks in keymap introspection (#24464) * Add check Tap Dance count check to keymap introspection * Add checks for combos and key overrides to introspection --- quantum/keymap_introspection.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c index 327df6e277..236b54ce98 100644 --- a/quantum/keymap_introspection.c +++ b/quantum/keymap_introspection.c @@ -102,6 +102,8 @@ __attribute__((weak)) uint16_t combo_count(void) { return combo_count_raw(); } +_Static_assert(ARRAY_SIZE(key_combos) <= (QK_KB), "Number of combos is abnormally high. Are you using SAFE_RANGE in an enum for combos?"); + combo_t* combo_get_raw(uint16_t combo_idx) { if (combo_idx >= combo_count_raw()) { return NULL; @@ -127,6 +129,8 @@ __attribute__((weak)) uint16_t tap_dance_count(void) { return tap_dance_count_raw(); } +_Static_assert(ARRAY_SIZE(tap_dance_actions) <= (QK_TAP_DANCE_MAX - QK_TAP_DANCE), "Number of tap dance actions exceeds maximum. Are you using SAFE_RANGE in tap dance enum?"); + tap_dance_action_t* tap_dance_get_raw(uint16_t tap_dance_idx) { if (tap_dance_idx >= tap_dance_count_raw()) { return NULL; @@ -153,6 +157,8 @@ __attribute__((weak)) uint16_t key_override_count(void) { return key_override_count_raw(); } +_Static_assert(ARRAY_SIZE(key_overrides) <= (QK_KB), "Number of key overrides is abnormally high. Are you using SAFE_RANGE in an enum for key overrides?"); + const key_override_t* key_override_get_raw(uint16_t key_override_idx) { if (key_override_idx >= key_override_count_raw()) { return NULL;