OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a possible sigsegv in getopt 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1252 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-11-16 14:54:29 +00:00
parent 3a02c111ca
commit e4fa1da557
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/lib_getopt.c
View File

@ -131,7 +131,7 @@ int getopt(int argc, FAR char *const argv[], FAR const char *optstring)
/* Are we resuming in the middle, or at the end of a string of arguments?
* g_optptr == NULL means that we are started at the beginning of argv[optind];
* *g_optptr == means that we are starting at the beginning of optind+1
* *g_optptr == \0 means that we are starting at the beginning of optind+1
*/
while (!g_optptr || !*g_optptr)
@ -147,24 +147,26 @@ int getopt(int argc, FAR char *const argv[], FAR const char *optstring)
*/
optind++;
if (!argv[optind])
{
/* There are no more arguments, we are finished */
}
g_optptr = NULL;
g_binitialized = FALSE;
/* Check for the end of the argument list */
/* Return -1 with optind == all of the arguments */
g_optptr = argv[optind];
if (!g_optptr)
{
/* There are no more arguments, we are finished */
return ERROR;
}
g_binitialized = FALSE;
/* Return -1 with optind == all of the arguments */
return ERROR;
}
/* We are starting at the beginning of argv[optind]. In this case, the
* first character must be '-'
*/
g_optptr = argv[optind];
if (*g_optptr != '-')
{
/* The argument does not start with '-', we are finished */
@ -238,9 +240,11 @@ int getopt(int argc, FAR char *const argv[], FAR const char *optstring)
}
/* No.. is the optional argument the next argument in argv[] ? */
if (argv[optind+1] && *argv[optind+1] != '-')
{
/* Yes.. retun that */
/* Yes.. return that */
optarg = argv[optind+1];
optind += 2;
g_optptr = NULL;
@ -248,6 +252,7 @@ int getopt(int argc, FAR char *const argv[], FAR const char *optstring)
}
/* No argument was supplied */
optarg = NULL;
optopt = *optchar;
optind++;