From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 6 Nov 2009 06:04:21 +0000 (-0500)
Subject: Cast away a minor type mismatch.
X-Git-Tag: v2.8.0~233
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c37aaf4cb05a8ce10a2e4a9b7ca563852b4143e;p=thirdparty%2Flibarchive.git

Cast away a minor type mismatch.

SVN-Revision: 1582
---

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index d776e7032..4c19b8e0d 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -399,8 +399,8 @@ archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
 	struct zip *zip = a->format_data;
 	struct zip_file_header_link *l = zip->central_directory_end;
 
-	if (s > zip->remaining_data_bytes)
-		s = zip->remaining_data_bytes;
+	if ((int64_t)s > zip->remaining_data_bytes)
+		s = (size_t)zip->remaining_data_bytes;
 
 	if (s == 0) return 0;