luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

getopt_common(): Correct handling of unsupported long options.

Browse source 
If an unrecognized long option is encountered, we must skip over that argv[] entry or getopt_long() will seriously misbehave.

Affects getopt_long() and getopt_long_only()

Problem found and fix verified with an updated version of the OS test.
This commit is contained in:
Gregory Nutt 2021-04-03 21:02:22 -06:00 • committed by Xiang Xiao
parent 42489759fe
commit 7e1ae24c3c
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libs/libc/unistd/lib_getopt_common.c
View file

@ -384,7 +384,16 @@ int getopt_common(int argc, FAR char * const argv[],
/* And parse the long option */
return getopt_long_option(go, argv, longopts, longindex);
ret = getopt_long_option(go, argv, longopts, longindex);
if (ret == '?')
{
/* Skip over the unrecognized long option */
go->go_optind++;
go->go_optptr = NULL;
}
return ret;
}
/* The -option form is only valid in getop_long_only() mode and
@ -401,8 +410,18 @@ int getopt_common(int argc, FAR char * const argv[],
*/
ret = getopt_long_option(go, argv, longopts, longindex);
if (ret != '?' || *(go->go_optptr + 1) != '\0')
if (ret != '?')
{
/* Success or ERROR */
return ret;
}
else if (*(go->go_optptr + 1) != '\0')
{
/* Skip over the unrecognized long option */
go->go_optind++;
go->go_optptr = NULL;
return ret;
}
}