From: Kees van Reeuwijk <reeuwijk@few.vu.nl>
Date: Tue, 9 Mar 2010 16:21:41 +0000 (+0000)
Subject: Prevent the use of an unitialized variable for block size in CRC calculation.
X-Git-Tag: v3.1.7~246
X-Git-Url: http://zhaoyanbai.com/repos/man.dnssec-importkey.html?a=commitdiff_plain;h=cf95efbad1362996a501706697e9683e70beaf04;p=minix.git

Prevent the use of an unitialized variable for block size in CRC calculation.
---

diff --git a/commands/pax/file_subs.c b/commands/pax/file_subs.c
index 89e4a6d39..9157df72a 100644
--- a/commands/pax/file_subs.c
+++ b/commands/pax/file_subs.c
@@ -938,7 +938,7 @@ set_crc(ARCHD *arcn, int fd)
 	int i;
 	int res;
 	off_t cpcnt = 0L;
-	u_long size;
+	u_long size = FILEBLK;
 	unsigned long crc = 0L;
 	char tbuf[FILEBLK];
 	struct stat sb;
@@ -951,12 +951,6 @@ set_crc(ARCHD *arcn, int fd)
 		return(0);
 	}
 
-#if 0
-	/* not in minix */
-	if ((size = (u_long)arcn->sb.st_blksize) > (u_long)sizeof(tbuf))
-		size = (u_long)sizeof(tbuf);
-#endif
-
 	/*
 	 * read all the bytes we think that there are in the file. If the user
 	 * is trying to archive an active file, forget this file.