From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 29 Dec 2008 02:28:05 +0000 (-0500)
Subject: Don't try to fuzz files that libarchive on this platform cannot read.
X-Git-Tag: v2.7.0~509
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0728043540f00880e76bf22695341354ee73353e;p=thirdparty%2Flibarchive.git

Don't try to fuzz files that libarchive on this platform cannot read.

Submitted by:	Michihiro NAKAJIMA

SVN-Revision: 331
---

diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c
index 9d59a1782..5aa053824 100644
--- a/libarchive/test/test_fuzz.c
+++ b/libarchive/test/test_fuzz.c
@@ -51,13 +51,19 @@ __FBSDID("$FreeBSD: src/lib/libarchive/test/test_fuzz.c,v 1.1 2008/12/06 07:08:0
 static const char *
 files[] = {
 	"test_fuzz_1.iso",
+#if HAVE_BZLIB_H
 	"test_compat_bzip2_1.tbz",
-	"test_compat_gtar_1.tgz",
+#endif
+	"test_compat_gtar_1.tar",
 	"test_compat_tar_hardlink_1.tar",
+#if HAVE_ZLIB_H
 	"test_compat_zip_1.zip",
+#endif
 	"test_read_format_gtar_sparse_1_17_posix10_modified.tar",
 	"test_read_format_tar_empty_filename.tar",
+#if HAVE_ZLIB_H
 	"test_read_format_zip.zip",
+#endif
 	NULL
 };
 
@@ -84,7 +90,7 @@ DEFINE_TEST(test_fuzz)
 
 			/* Fuzz < 1% of the bytes in the archive. */
 			memcpy(image, rawimage, size);
-			numbytes = rand() % (size / 100);
+			numbytes = (int)(rand() % (size / 100));
 			for (j = 0; j < numbytes; ++j)
 				image[rand() % size] = (char)rand();
 
@@ -93,7 +99,7 @@ DEFINE_TEST(test_fuzz)
 			fd = open("after.test.failure.send.this.file."
 			    "to.libarchive.maintainers.with.system.details",
 			    O_WRONLY | O_CREAT | O_TRUNC, 0744);
-			write(fd, image, size);
+			write(fd, image, (off_t)size);
 			close(fd);
 
 			assert((a = archive_read_new()) != NULL);