mhu/shellmatta
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bugfix/#18-lengt-of-commands-not-checked' of shimatta/shellmatta into develop

Browse Source 
fix #18 added length check in command parser
This commit is contained in:
shimatta 2019-07-28 22:35:47 +02:00 committed by Gogs
commit ad60578aab
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/shellmatta.c
View File

@ -193,6 +193,7 @@ shellmatta_retCode_t shellmatta_processData(shellmatta_handle_t handle,
{ {
shellmatta_cmd_t *cmd; shellmatta_cmd_t *cmd;
uint8_t cmdExecuted = 0u; uint8_t cmdExecuted = 0u;
uint32_t cmdLen;
shellmatta_retCode_t ret = SHELLMATTA_OK; shellmatta_retCode_t ret = SHELLMATTA_OK;
shellmatta_instance_t *inst = (shellmatta_instance_t*)handle; shellmatta_instance_t *inst = (shellmatta_instance_t*)handle;
@ -225,16 +226,27 @@ shellmatta_retCode_t shellmatta_processData(shellmatta_handle_t handle,
history_storeCmd(inst); history_storeCmd(inst);
history_reset(inst); history_reset(inst);
/** -# determine the cmd len (chars until first space or \0 is found */
cmdLen = 0u;
while( (cmdLen < inst->inputCount)
&& (' ' != inst->buffer[cmdLen])
&& ('\0' != inst->buffer[cmdLen]))
{
cmdLen ++;
}
/** -# search for a matching command */ /** -# search for a matching command */
while (NULL != cmd) while (NULL != cmd)
{ {
/* only compare the length of the command -1 (to avoid comparing the \0 */ /** -# compare command string and length */
if ( (0 == strncmp( inst->buffer, if ( ((0 == strncmp( inst->buffer,
cmd->cmd, cmd->cmd,
strlen(cmd->cmd))) cmdLen))
|| (0 == strncmp( inst->buffer, && (cmdLen == strlen(cmd->cmd)))
|| ((0 == strncmp( inst->buffer,
cmd->cmdAlias, cmd->cmdAlias,
strlen(cmd->cmdAlias)))) cmdLen))
&& (cmdLen == strlen(cmd->cmdAlias))))
{ {
inst->write("\r\n", 2u); inst->write("\r\n", 2u);