libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #764 from AubrCool/fix-msh.argc.error 

[Components] correct msh argc too many error
This commit is contained in:
Bernard Xiong 2017-07-19 23:53:44 +08:00 committed by GitHub
parent 8819016f28 e4fea38726
commit 6ab027677b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/finsh/msh.c
View File

@ -26,6 +26,7 @@
* Date Author Notes * Date Author Notes
* 2013-03-30 Bernard the first verion for finsh * 2013-03-30 Bernard the first verion for finsh
* 2014-01-03 Bernard msh can execute module. * 2014-01-03 Bernard msh can execute module.
* 2017-07-19 Aubr.Cool limit argc to RT_FINSH_ARG_MAX
*/ */
#include "msh.h" #include "msh.h"
@ -103,6 +104,7 @@ static int msh_split(char *cmd, rt_size_t length, char *argv[RT_FINSH_ARG_MAX])
char *ptr; char *ptr;
rt_size_t position; rt_size_t position;
rt_size_t argc; rt_size_t argc;
rt_size_t i;
ptr = cmd; ptr = cmd;
position = 0; argc = 0; position = 0; argc = 0;
@ -115,6 +117,18 @@ static int msh_split(char *cmd, rt_size_t length, char *argv[RT_FINSH_ARG_MAX])
*ptr = '\0'; *ptr = '\0';
ptr ++; position ++; ptr ++; position ++;
} }
if(argc >= RT_FINSH_ARG_MAX)
{
rt_kprintf("Too many args ! We only Use:\n");
for(i = 0; i < argc; i++)
{
rt_kprintf("%s ", argv[i]);
}
rt_kprintf("\n");
break;
}
if (position >= length) break; if (position >= length) break;
/* handle string */ /* handle string */