From owner-svn-src-vendor@FreeBSD.ORG  Thu May 14 21:34:21 2015
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 78FD94CF;
 Thu, 14 May 2015 21:34:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 6752B16F4;
 Thu, 14 May 2015 21:34:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4ELYLQV068431;
 Thu, 14 May 2015 21:34:21 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4ELYLbw068430;
 Thu, 14 May 2015 21:34:21 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201505142134.t4ELYLbw068430@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 14 May 2015 21:34:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r282928 - vendor/libarchive/dist/libarchive
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2015 21:34:21 -0000

Author: delphij
Date: Thu May 14 21:34:20 2015
New Revision: 282928
URL: https://svnweb.freebsd.org/changeset/base/282928

Log:
  Apply upstream changeset e6c9668:
  
  Add a check to archive_read_filter_consume to reject any
  attempts to move the file pointer by a negative amount.
  
  Note:  Either this or commit 3865cf2 provides a fix for
  Issue 394.

Modified:
  vendor/libarchive/dist/libarchive/archive_read.c

Modified: vendor/libarchive/dist/libarchive/archive_read.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read.c	Thu May 14 21:33:33 2015	(r282927)
+++ vendor/libarchive/dist/libarchive/archive_read.c	Thu May 14 21:34:20 2015	(r282928)
@@ -1394,6 +1394,8 @@ __archive_read_filter_consume(struct arc
 {
 	int64_t skipped;
 
+	if (request < 0)
+		return ARCHIVE_FATAL;
 	if (request == 0)
 		return 0;