Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 20:08:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

execl(): Don't allocate or free and argv[] list if there are not arguments

Browse Source
This commit is contained in:
Gregory Nutt
2014-11-13 06:35:20 -06:00
parent 5286205790
commit 2a0549865f
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libc/unistd/lib_execl.c
+26 -19
View File
@@ -124,7 +124,7 @@
int execl(FAR const char *path, ...) int execl(FAR const char *path, ...)
{ {
FAR char **argv; FAR char **argv = (FAR char **)NULL;
size_t nargs; size_t nargs;
va_list ap; va_list ap;
int argc; int argc;
@@ -152,32 +152,39 @@ int execl(FAR const char *path, ...)
/* Allocate a temporary argv[] array */ /* Allocate a temporary argv[] array */
argv = (FAR char **)malloc((nargs + 1) * sizeof(FAR char *)); if (nargs > 0)
if (argv = (FAR char **)NULL)
{ {
set_errno(ENOMEM); argv = (FAR char **)malloc((nargs + 1) * sizeof(FAR char *));
return ERROR; if (argv = (FAR char **)NULL)
{
set_errno(ENOMEM);
return ERROR;
}
/* Collect the arguments into the argv[] array */
va_start(ap, path);
for (argc = 0; argc < nargs; argc++)
{
argv[argc] = va_arg(ap, FAR char *);
}
argv[nargs] = NULL;
va_end(ap);
} }
/* Collect the arguments into the argv[] array */
va_start(ap, path);
for (argc = 0; argc < nargs; argc++)
{
argv[argc] = va_arg(ap, FAR char *);
}
argv[nargs] = NULL;
va_end(ap);
/* Then let execv() do the real work */ /* Then let execv() do the real work */
ret = execv(path, (char * const *)&argv); ret = execv(path, (FAR char * const *)argv);
/* Free the allocated argv[] list */ /* Free the allocated argv[] list */
free(argv); if (argv)
{
free(argv);
}
return ret; return ret;
} }
#endif /* CONFIG_LIBC_EXECFUNCS */ #endif /* CONFIG_LIBC_EXECFUNCS */