From owner-svn-src-head@freebsd.org  Fri Sep  4 08:04:13 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 412219C91CB;
 Fri,  4 Sep 2015 08:04:13 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 31FBB1FA;
 Fri,  4 Sep 2015 08:04:13 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8484DHw026995;
 Fri, 4 Sep 2015 08:04:13 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8484Dth026994;
 Fri, 4 Sep 2015 08:04:13 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201509040804.t8484Dth026994@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 4 Sep 2015 08:04:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287454 - head/contrib/file/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Sep 2015 08:04:13 -0000

Author: delphij
Date: Fri Sep  4 08:04:12 2015
New Revision: 287454
URL: https://svnweb.freebsd.org/changeset/base/287454

Log:
  Fix build.

Modified:
  head/contrib/file/src/readelf.c

Modified: head/contrib/file/src/readelf.c
==============================================================================
--- head/contrib/file/src/readelf.c	Fri Sep  4 05:56:14 2015	(r287453)
+++ head/contrib/file/src/readelf.c	Fri Sep  4 08:04:12 2015	(r287454)
@@ -1052,7 +1052,7 @@ doshn(struct magic_set *ms, int clazz, i
 		/* Things we can determine when we seek */
 		switch (xsh_type) {
 		case SHT_NOTE:
-			if (xsh_size + xsh_offset > (uintmax_t)fsize)  {
+			if (xsh_size + (uintmax_t)xsh_offset > (uintmax_t)fsize)  {
 				if (file_printf(ms,
 				    ", note offset/size 0x%jx+0x%jx exceeds"
 				    " file size 0x%jx", (uintmax_t)xsh_offset,