mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

key-state: Prevent array overflow

Browse source 
- Prevent adding the same keycode more than once
- Prevent adding more keycodes than MAX_PRESSED_KEYS
This commit is contained in:
John Lindgren 2022-11-02 16:26:33 -04:00 • committed by Johan Malm
parent ec8bc6e2d6
commit b163045fa9
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/key-state.c
View file

@ -12,6 +12,17 @@ struct key_array {
static struct key_array pressed, bound, pressed_sent; static struct key_array pressed, bound, pressed_sent;
static bool
key_present(struct key_array *array, uint32_t keycode)
{
for (int i = 0; i < array->nr_keys; ++i) {
if (array->keys[i] == keycode) {
return true;
}
}
return false;
}
static void static void
remove_key(struct key_array *array, uint32_t keycode) remove_key(struct key_array *array, uint32_t keycode)
{ {
@ -32,7 +43,9 @@ remove_key(struct key_array *array, uint32_t keycode)
static void static void
add_key(struct key_array *array, uint32_t keycode) add_key(struct key_array *array, uint32_t keycode)
{ {
array->keys[array->nr_keys++] = keycode; if (!key_present(array, keycode) && array->nr_keys < MAX_PRESSED_KEYS) {
array->keys[array->nr_keys++] = keycode;
}
} }
uint32_t * uint32_t *
@ -74,12 +87,7 @@ key_state_store_pressed_keys_as_bound(void)
bool bool
key_state_corresponding_press_event_was_bound(uint32_t keycode) key_state_corresponding_press_event_was_bound(uint32_t keycode)
{ {
for (int i = 0; i < bound.nr_keys; ++i) { return key_present(&bound, keycode);
if (bound.keys[i] == keycode) {
return true;
}
}
return false;
} }
void void