diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-06-15 21:07:18 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2007-06-15 21:07:18 +0000 |
| commit | 79a78e3eafbb54734b0c6e88004e5dc9c06dd400 (patch) | |
| tree | 99a3a2b220833e0c26ac31161f55b71fa634b15b /sbin/dump/traverse.c | |
| parent | 72128a2184d9965d47f1b7df5d2596fc73f8fd99 (diff) | |
don't use static data in recursive functions; from FreeBSD; fixes PR 5509
and other reports about dump accessing wrong blocks; ok beck@ deraadt@
Diffstat (limited to 'sbin/dump/traverse.c')
| -rw-r--r-- | sbin/dump/traverse.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 17af142cae4..b603eb61d92 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traverse.c,v 1.22 2007/06/11 16:50:33 millert Exp $ */ +/* $OpenBSD: traverse.c,v 1.23 2007/06/15 21:07:17 otto Exp $ */ /* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; #else -static const char rcsid[] = "$OpenBSD: traverse.c,v 1.22 2007/06/11 16:50:33 millert Exp $"; +static const char rcsid[] = "$OpenBSD: traverse.c,v 1.23 2007/06/15 21:07:17 otto Exp $"; #endif #endif /* not lint */ @@ -380,10 +380,8 @@ dirindir(ino_t ino, daddr64_t blkno, int ind_level, off_t *filesize) { int ret = 0; int i; - static void *idblk; + char idblk[MAXBSIZE]; - if (idblk == NULL && (idblk = malloc(sblock->fs_bsize)) == NULL) - quit("dirindir: cannot allocate indirect memory.\n"); bread(fsbtodb(sblock, blkno), idblk, (int)sblock->fs_bsize); if (ind_level <= 0) { for (i = 0; *filesize > 0 && i < NINDIR(sblock); i++) { @@ -585,10 +583,8 @@ static void dmpindir(ino_t ino, daddr64_t blk, int ind_level, off_t *size) { int i, cnt; - static void *idblk; + char idblk[MAXBSIZE]; - if (idblk == NULL && (idblk = malloc(sblock->fs_bsize)) == NULL) - quit("dmpindir: cannot allocate indirect memory.\n"); if (blk != 0) bread(fsbtodb(sblock, blk), idblk, (int) sblock->fs_bsize); else |