From 1aafefdbe851eae335c83a88e2d24c17d8d49fcd Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Wed, 21 Dec 2011 15:06:01 +0000 Subject: [PATCH] Add missing integer casts to comparsions in libarchive read. MFC after: 2 weeks --- .../libarchive/archive_read_support_format_iso9660.c | 3 ++- .../libarchive/libarchive/archive_read_support_format_xar.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c b/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c index 516b844fa45a..744f13fb425d 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c @@ -1628,7 +1628,8 @@ parse_file_info(struct archive_read *a, struct file_info *parent, */ if (location > 0 && (location + ((fsize + iso9660->logical_block_size -1) - / iso9660->logical_block_size)) > iso9660->volume_block) { + / iso9660->logical_block_size)) + > (uint32_t)iso9660->volume_block) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Invalid location of extent of file"); return (NULL); diff --git a/contrib/libarchive/libarchive/archive_read_support_format_xar.c b/contrib/libarchive/libarchive/archive_read_support_format_xar.c index e6ce6b516b09..7194fa5d7189 100644 --- a/contrib/libarchive/libarchive/archive_read_support_format_xar.c +++ b/contrib/libarchive/libarchive/archive_read_support_format_xar.c @@ -2530,8 +2530,8 @@ xml_data(void *userData, const char *s, int len) #if DEBUG { char buff[1024]; - if (len > sizeof(buff)-1) - len = sizeof(buff)-1; + if (len > (int)sizeof(buff)-1) + len = (int)sizeof(buff)-1; memcpy(buff, s, len); buff[len] = 0; fprintf(stderr, "\tlen=%d:\"%s\"\n", len, buff);