system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-26 19:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix execl[e]. Multiple execle's failed because of bogus caching of the

Browse source 
pointer returned by realloc().  All callers free the pointer if the
execve fails.  Nuke the caching.  This essentially restores buildargv()
to the 1.1.5 version.  Also fix a memory leak if realloc() fails.  Also
nuke similar but non-broken caching in execvp().  malloc() should be
efficient enough.
This commit is contained in:
Bruce Evans 1994-12-12 01:15:01 +00:00
parent 4ecd9d4bfa
commit a2c0622293
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=5070
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/libc/gen/exec.c
View file

@ -58,19 +58,20 @@ buildargv(ap, arg, envpp)
const char *arg;
char ***envpp;
{
static int memsize;
static char **argv;
register int off;
register char **argv, **nargv;
register int memsize, off;
argv = NULL;
for (off = 0;; ++off) {
for (off = memsize = 0;; ++off) {
if (off >= memsize) {
memsize += 50; /* Starts out at 0. */
memsize *= 2; /* Ramp up fast. */
if (!(argv = realloc(argv, memsize * sizeof(char *)))) {
memsize = 0;
nargv = realloc(argv, memsize * sizeof(char *));
if (nargv == NULL) {
free(argv);
return (NULL);
}
argv = nargv;
if (off == 0) {
argv[0] = (char *)arg;
off = 1;
@ -183,8 +184,7 @@ execvp(name, argv)
const char *name;
char * const *argv;
{
static int memsize;
static char **memp;
char **memp;
register int cnt, lp, ln;
register char *p;
int eacces, etxtbsy;
@ -240,18 +240,16 @@ retry: (void)execve(bp, argv, environ);
case ENOENT:
break;
case ENOEXEC:
for (cnt = 0; argv[cnt]; ++cnt);
if ((cnt + 2) * sizeof(char *) > memsize) {
memsize = (cnt + 2) * sizeof(char *);
if ((memp = realloc(memp, memsize)) == NULL) {
memsize = 0;
goto done;
}
}
for (cnt = 0; argv[cnt]; ++cnt)
;
memp = malloc((cnt + 2) * sizeof(char *));
if (memp == NULL)
goto done;
memp[0] = "sh";
memp[1] = bp;
bcopy(argv + 1, memp + 2, cnt * sizeof(char *));
(void)execve(_PATH_BSHELL, memp, environ);
free(memp);
goto done;
case ETXTBSY:
if (etxtbsy < 3)