From owner-svn-src-all@FreeBSD.ORG  Wed Dec 21 15:06:01 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D63C0106566B;
	Wed, 21 Dec 2011 15:06:01 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C54418FC0A;
	Wed, 21 Dec 2011 15:06:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBLF61dC073734;
	Wed, 21 Dec 2011 15:06:01 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBLF61AE073731;
	Wed, 21 Dec 2011 15:06:01 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201112211506.pBLF61AE073731@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 21 Dec 2011 15:06:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228772 - head/contrib/libarchive/libarchive
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2011 15:06:01 -0000

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);