Author: mm
Date: Wed Dec 21 15:06:01 2011
New Revision: 228772
URL: http://svn.freebsd.org/changeset/base/228772
Log:
Add missing integer casts to comparsions in libarchive read.
MFC after: 2 weeks
Modified:
head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
head/contrib/libarchive/libarchive/archive_read_support_format_xar.c
Modified:
head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
Wed Dec 21 15:02:37 2011 (r228771)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
Wed Dec 21 15:06:01 2011 (r228772)
@@ -1628,7 +1628,8 @@ parse_file_info(struct archive_read *a,
*/
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);
Modified: head/contrib/libarchive/libarchive/archive_read_support_format_xar.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_xar.c
Wed Dec 21 15:02:37 2011 (r228771)
+++ head/contrib/libarchive/libarchive/archive_read_support_format_xar.c
Wed Dec 21 15:06:01 2011 (r228772)
@@ -2530,8 +2530,8 @@ xml_data(void *userData, const char *s,
#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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
