diff options
| author | mm <mm@FreeBSD.org> | 2011-12-21 15:06:01 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-12-21 15:06:01 +0000 |
| commit | 9836aa783e70e5b9dde285c14fc1f9f2de2a2e44 (patch) | |
| tree | 83c3a03fb4471611d44d3680aeaf660826687c05 /contrib/libarchive | |
| parent | 8ee1bd70e81572c768fd0abc35dc7de2f200c15c (diff) | |
| download | FreeBSD-src-9836aa783e70e5b9dde285c14fc1f9f2de2a2e44.zip FreeBSD-src-9836aa783e70e5b9dde285c14fc1f9f2de2a2e44.tar.gz | |
Add missing integer casts to comparsions in libarchive read.
MFC after: 2 weeks
Diffstat (limited to 'contrib/libarchive')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_read_support_format_iso9660.c | 3 | ||||
| -rw-r--r-- | contrib/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 516b844..744f13f 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 e6ce6b5..7194fa5 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); |
