diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-15 20:23:21 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-15 20:23:21 +0000 |
| commit | f0507b9ffcb2da069000ab407839b071c3fd3f05 (patch) | |
| tree | 242c33efcc7e1bddf325bf43dcc7439f1ed7219b /bin/ls | |
| parent | ad12df089efca37695d2c12d022426e944e7af4f (diff) | |
realloc bug fix and two other bugs found at the same time
Diffstat (limited to 'bin/ls')
| -rw-r--r-- | bin/ls/print.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/ls/print.c b/bin/ls/print.c index 5569c264758..5405201a234 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.8 1998/05/18 20:36:31 deraadt Exp $ */ +/* $OpenBSD: print.c,v 1.9 1998/08/15 20:23:20 deraadt Exp $ */ /* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.8 1998/05/18 20:36:31 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.9 1998/08/15 20:23:20 deraadt Exp $"; #endif #endif /* not lint */ @@ -152,12 +152,16 @@ printcol(dp) * of pointers. */ if (dp->entries > lastentries) { - lastentries = dp->entries; - if ((array = + FTSENT **a; + + if ((a = realloc(array, dp->entries * sizeof(FTSENT *))) == NULL) { warn(NULL); printscol(dp); + return; } + lastentries = dp->entries; + array = a; } for (p = dp->list, num = 0; p; p = p->fts_link) if (p->fts_number != NO_PRINT) |