uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add error checking to parseSwitchKeymapAction

Browse Source
This commit is contained in:
Eric Tang
2017-08-08 09:47:39 -07:00
parent 2621707206
commit 31de620fee
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
right/src/config_parser/parse_config.h
View File

@@ -16,6 +16,7 @@
ParserError_InvalidModuleCount, ParserError_InvalidModuleCount,
ParserError_InvalidActionCount, ParserError_InvalidActionCount,
ParserError_InvalidSerializedMacroActionType, ParserError_InvalidSerializedMacroActionType,
ParserError_InvalidSerializedSwitchKeymapAction,
} parser_error_t; } parser_error_t;
// Functions: // Functions:

6
right/src/config_parser/parse_keymap.c
View File

@@ -3,6 +3,8 @@
#include "keymaps.h" #include "keymaps.h"
#include "led_display.h" #include "led_display.h"
uint8_t tempKeymapCount;
static parser_error_t parseNoneAction(key_action_t *keyAction, config_buffer_t *buffer) { static parser_error_t parseNoneAction(key_action_t *keyAction, config_buffer_t *buffer) {
keyAction->type = KeyActionType_None; keyAction->type = KeyActionType_None;
return ParserError_Success; return ParserError_Success;
@@ -51,6 +53,9 @@ static parser_error_t parseSwitchLayerAction(key_action_t *KeyAction, config_buf
static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, config_buffer_t *buffer) { static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, config_buffer_t *buffer) {
uint8_t keymapIndex = readUInt8(buffer); uint8_t keymapIndex = readUInt8(buffer);
if (keymapIndex >= tempKeymapCount) {
return ParserError_InvalidSerializedSwitchKeymapAction;
}
keyAction->type = KeyActionType_SwitchKeymap; keyAction->type = KeyActionType_SwitchKeymap;
keyAction->switchKeymap.keymapId = keymapIndex; keyAction->switchKeymap.keymapId = keymapIndex;
return ParserError_Success; return ParserError_Success;
@@ -200,6 +205,7 @@ parser_error_t ParseKeymap(config_buffer_t *buffer, uint8_t keymapIdx, uint8_t k
DefaultKeymapIndex = keymapIdx; DefaultKeymapIndex = keymapIdx;
} }
} }
tempKeymapCount = keymapCount;
for (uint16_t layerIdx = 0; layerIdx < layerCount; layerIdx++) { for (uint16_t layerIdx = 0; layerIdx < layerCount; layerIdx++) {
errorCode = parseLayer(buffer, layerIdx); errorCode = parseLayer(buffer, layerIdx);
if (errorCode != ParserError_Success) { if (errorCode != ParserError_Success) {