d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a fixed MAXBSIZE-size auto array instead of a static pointer

Browse Source 
to a malloc'd buffer in dmpindir() and dirindir(). These functions
recursively call themselves to handle deeper levels of indirect
blocks, so a single static buffer was not suitable.

Bug tracked down by:	Don Lewis <dl-freebsd@catspoiler.org>
Approach suggested by:	bde
This commit is contained in:
Ian Dowse 2002-07-08 01:25:54 +00:00
parent f59685a4b7
commit 1e0276afb3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=99564
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/dump/traverse.c
View File

@ -277,10 +277,8 @@ dirindir(
{
int ret = 0;
int i;
static caddr_t 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++) {
@ -501,10 +499,8 @@ static void
dmpindir(ino_t ino, ufs2_daddr_t blk, int ind_level, off_t *size)
{
int i, cnt;
static caddr_t 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