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

Make the configuration parser check that every array has an expected length

Browse Source
This commit is contained in:
Eric Tang
2017-07-06 17:41:54 -07:00
parent 0d68f190e1
commit 042fb60192
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
right/src/config/parse_keymap.c
View File

@@ -9,6 +9,9 @@ enum {
ParserError_InvalidSerializedKeystrokeType, ParserError_InvalidSerializedKeystrokeType,
ParserError_InvalidSerializedMouseAction, ParserError_InvalidSerializedMouseAction,
ParserError_InvalidSerializedKeyActionType, ParserError_InvalidSerializedKeyActionType,
ParserError_InvalidLayerCount,
ParserError_InvalidModuleCount,
ParserError_InvalidActionCount,
}; };
static uint8_t readUInt8(serialized_buffer_t *buffer) { static uint8_t readUInt8(serialized_buffer_t *buffer) {
@@ -170,6 +173,9 @@ static uint8_t parseKeyActions(uint8_t targetLayer, serialized_buffer_t *buffer,
uint8_t errorCode; uint8_t errorCode;
uint8_t actionCount = readCompactLength(buffer); uint8_t actionCount = readCompactLength(buffer);
if (actionCount > MAX_KEY_COUNT_PER_MODULE) {
return ParserError_InvalidActionCount;
}
for (uint8_t actionIdx = 0; actionIdx < actionCount; actionIdx++) { for (uint8_t actionIdx = 0; actionIdx < actionCount; actionIdx++) {
key_action_t *keyAction = &(CurrentKeymap[targetLayer][moduleId][actionIdx]); key_action_t *keyAction = &(CurrentKeymap[targetLayer][moduleId][actionIdx]);
errorCode = parseKeyAction(keyAction, buffer); errorCode = parseKeyAction(keyAction, buffer);
@@ -194,6 +200,9 @@ static uint8_t parseLayer(serialized_buffer_t *buffer, uint8_t layer) {
uint8_t errorCode; uint8_t errorCode;
uint8_t moduleCount = readCompactLength(buffer); uint8_t moduleCount = readCompactLength(buffer);
if (moduleCount > SLOT_COUNT) {
return ParserError_InvalidModuleCount;
}
for (uint8_t moduleIdx = 0; moduleIdx < moduleCount; moduleIdx++) { for (uint8_t moduleIdx = 0; moduleIdx < moduleCount; moduleIdx++) {
clearModule(layer, moduleIdx); clearModule(layer, moduleIdx);
errorCode = parseModule(buffer, layer); errorCode = parseModule(buffer, layer);
@@ -219,6 +228,9 @@ uint8_t ParseKeymap(serialized_buffer_t *buffer) {;
(void)isDefault; (void)isDefault;
(void)name; (void)name;
(void)description; (void)description;
if (layerCount != LAYER_COUNT) {
return ParserError_InvalidLayerCount;
}
for (uint8_t layerIdx = 0; layerIdx < layerCount; layerIdx++) { for (uint8_t layerIdx = 0; layerIdx < layerCount; layerIdx++) {
errorCode = parseLayer(buffer, layerIdx); errorCode = parseLayer(buffer, layerIdx);
if (errorCode != ParserError_Success) { if (errorCode != ParserError_Success) {