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

Check the value of macroCount

Browse Source
This commit is contained in:
Eric Tang
2017-08-09 10:02:33 -07:00
parent c983e58d8e
commit 558089f856
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
right/src/config_parser/parse_config.c
View File

@@ -3,6 +3,7 @@
#include "parse_macro.h" #include "parse_macro.h"
#include "keymaps.h" #include "keymaps.h"
#include "config_globals.h" #include "config_globals.h"
#include "macros.h"
static parser_error_t parseModuleConfiguration(config_buffer_t *buffer) static parser_error_t parseModuleConfiguration(config_buffer_t *buffer)
{ {
@@ -37,6 +38,9 @@ parser_error_t ParseConfig(config_buffer_t *buffer)
} }
} }
macroCount = readCompactLength(buffer); macroCount = readCompactLength(buffer);
if (macroCount > MAX_MACRO_NUM) {
return ParserError_InvalidMacroCount;
}
for (uint16_t macroIdx = 0; macroIdx < macroCount; macroIdx++) { for (uint16_t macroIdx = 0; macroIdx < macroCount; macroIdx++) {
errorCode = ParseMacro(buffer, macroIdx); errorCode = ParseMacro(buffer, macroIdx);
if (errorCode != ParserError_Success) { if (errorCode != ParserError_Success) {

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

@@ -20,6 +20,7 @@
ParserError_InvalidModuleConfigurationCount, ParserError_InvalidModuleConfigurationCount,
ParserError_InvalidKeymapCount, ParserError_InvalidKeymapCount,
ParserError_InvalidAbbreviationLen, ParserError_InvalidAbbreviationLen,
ParserError_InvalidMacroCount,
} parser_error_t; } parser_error_t;
// Functions: // Functions: