diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-14 21:39:45 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-14 21:39:45 +0000 |
| commit | fbe7a4e21ce2effe646980ca1214c125d94c70fd (patch) | |
| tree | 50eb4ae3c83a05be96515dfbe68af415625afbfa /lib/libc/gen/getcwd.c | |
| parent | eef299572b3aae714384affd3dae3292c7325f78 (diff) | |
realloc repair
Diffstat (limited to 'lib/libc/gen/getcwd.c')
| -rw-r--r-- | lib/libc/gen/getcwd.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c index 7809e02f20e..5234bb8ff67 100644 --- a/lib/libc/gen/getcwd.c +++ b/lib/libc/gen/getcwd.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getcwd.c,v 1.4 1997/07/09 00:28:20 millert Exp $"; +static char rcsid[] = "$OpenBSD: getcwd.c,v 1.5 1998/08/14 21:39:26 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -135,8 +135,11 @@ getcwd(pt, size) * possible component name, plus a trailing NULL. */ if (bup + 3 + MAXNAMLEN + 1 >= eup) { - if ((up = realloc(up, upsize *= 2)) == NULL) + char *nup; + + if ((nup = realloc(up, upsize *= 2)) == NULL) goto err; + up = nup; bup = up; eup = up + upsize; } @@ -189,6 +192,7 @@ getcwd(pt, size) */ if (bpt - pt <= dp->d_namlen + (first ? 1 : 2)) { size_t len, off; + char *npt; if (!ptsize) { errno = ERANGE; @@ -196,8 +200,9 @@ getcwd(pt, size) } off = bpt - pt; len = ept - bpt; - if ((pt = realloc(pt, ptsize *= 2)) == NULL) + if ((npt = realloc(pt, ptsize *= 2)) == NULL) goto err; + pt = npt; bpt = pt + off; ept = pt + ptsize; bcopy(bpt, ept - len, len); @@ -225,7 +230,8 @@ notfound: err: if (ptsize) free(pt); - free(up); + if (up) + free(up); if (dir) (void)closedir(dir); return (NULL); |