diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-09-26 21:26:41 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-09-26 21:26:41 +0000 |
| commit | 63bb5173c800c402d2b0e943fb52b30ec97afecb (patch) | |
| tree | 73c916ea4d3c9d1940b4657c4ea217b815e951af /usr.bin/apply | |
| parent | e183ff4e645844d44a2e5ccefab11b4e5135c148 (diff) | |
better realloc. ok deraadt@
Diffstat (limited to 'usr.bin/apply')
| -rw-r--r-- | usr.bin/apply/apply.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 83d499c48cc..91ce1ee0494 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apply.c,v 1.15 2003/06/10 22:20:44 deraadt Exp $ */ +/* $OpenBSD: apply.c,v 1.16 2003/09/26 21:26:05 tedu Exp $ */ /* $NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $ */ /*- @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; #else -static char rcsid[] = "$OpenBSD: apply.c,v 1.15 2003/06/10 22:20:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: apply.c,v 1.16 2003/09/26 21:26:05 tedu Exp $"; #endif #endif /* not lint */ @@ -60,6 +60,7 @@ main(int argc, char *argv[]) { int ch, clen, debug, i, l, magic, n, nargs, rval; char *c, *cmd, *p, *q; + const char *c2; size_t len; debug = 0; @@ -167,8 +168,12 @@ main(int argc, char *argv[]) */ for (l = strlen(cmd), i = 0; i < nargs; i++) l += strlen(argv[i+1]); - if (l > clen && (c = realloc(c, clen = l)) == NULL) - err(1, NULL); + if (l > clen) { + if ((c2 = realloc(c, l)) == NULL) + err(1, NULL); + c = c2; + clen = l; + } /* Expand command argv references. */ for (p = cmd, q = c; *p != '\0'; ++p) |