max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: Fix out-of-bounds access by TICK event #487

Browse source 
The error is caused in layer_swtich_get_action() and fails to access layer_pressed[][]
This commit is contained in:
tmk 2017-10-22 03:09:20 +09:00
parent f896d3350f
commit df7ce59d1c
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tmk_core/common/action.c
View file

@ -531,6 +531,8 @@ void clear_keyboard_but_mods(void)
bool is_tap_key(keyevent_t event) bool is_tap_key(keyevent_t event)
{ {
if (IS_NOEVENT(event)) { return false; }
action_t action = layer_switch_get_action(event); action_t action = layer_switch_get_action(event);
switch (action.kind.id) { switch (action.kind.id) {

2
tmk_core/common/action_layer.c
View file

@ -148,6 +148,8 @@ static uint8_t layer_pressed[MATRIX_ROWS][MATRIX_COLS] = {};
#endif #endif
action_t layer_switch_get_action(keyevent_t event) action_t layer_switch_get_action(keyevent_t event)
{ {
if (IS_NOEVENT(event)) return (action_t)ACTION_NO;
uint8_t layer = 0; uint8_t layer = 0;
#ifndef NO_TRACK_KEY_PRESS #ifndef NO_TRACK_KEY_PRESS
if (event.pressed) { if (event.pressed) {