emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getopt32: do not return pointer to alloca() areas

Browse Source
This commit is contained in:
Denis Vlasenko 2008-08-20 23:03:38 +00:00
parent b9c262b029
commit e417be6697
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libbb/getopt32.c
View File

@ -155,12 +155,20 @@ Special characters:
Allows any arguments to be given without a dash (./program w x) Allows any arguments to be given without a dash (./program w x)
as well as with a dash (./program -x). as well as with a dash (./program -x).
NB: getopt32() will leak a small amount of memory if you use
this option! Do not use it if there is a possibility of recursive
getopt32() calls.
"--" A double dash at the beginning of opt_complementary means the "--" A double dash at the beginning of opt_complementary means the
argv[1] string should always be treated as options, even if it isn't argv[1] string should always be treated as options, even if it isn't
prefixed with a "-". This is useful for special syntax in applets prefixed with a "-". This is useful for special syntax in applets
such as "ar" and "tar": such as "ar" and "tar":
tar xvf foo.tar tar xvf foo.tar
NB: getopt32() will leak a small amount of memory if you use
this option! Do not use it if there is a possibility of recursive
getopt32() calls.
"-N" A dash as the first char in a opt_complementary group followed "-N" A dash as the first char in a opt_complementary group followed
by a single digit (0-9) means that at least N non-option by a single digit (0-9) means that at least N non-option
arguments must be present on the command line arguments must be present on the command line
@ -493,7 +501,10 @@ getopt32(char **argv, const char *applet_opts, ...)
pargv = argv + 1; pargv = argv + 1;
while (*pargv) { while (*pargv) {
if (pargv[0][0] != '-' && pargv[0][0] != '\0') { if (pargv[0][0] != '-' && pargv[0][0] != '\0') {
char *pp = alloca(strlen(*pargv) + 2); /* Can't use alloca: opts with params will
* return pointers to stack!
* NB: we leak these allocations... */
char *pp = xmalloc(strlen(*pargv) + 2);
*pp = '-'; *pp = '-';
strcpy(pp + 1, *pargv); strcpy(pp + 1, *pargv);
*pargv = pp; *pargv = pp;