From owner-svn-src-all@FreeBSD.ORG  Mon Dec 28 02:05:29 2009
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 1052D106568F;
	Mon, 28 Dec 2009 02:05:29 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 002D18FC1A;
	Mon, 28 Dec 2009 02:05:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBS25S2D075034;
	Mon, 28 Dec 2009 02:05:28 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBS25Soo075032;
	Mon, 28 Dec 2009 02:05:28 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200912280205.nBS25Soo075032@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 28 Dec 2009 02:05:28 +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: r201082 - head/lib/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: Mon, 28 Dec 2009 02:05:29 -0000

Author: kientzle
Date: Mon Dec 28 02:05:28 2009
New Revision: 201082
URL: http://svn.freebsd.org/changeset/base/201082

Log:
  Catch certain gzip failures at close time.

Modified:
  head/lib/libarchive/archive_read_support_compression_gzip.c

Modified: head/lib/libarchive/archive_read_support_compression_gzip.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_gzip.c	Mon Dec 28 02:04:42 2009	(r201081)
+++ head/lib/libarchive/archive_read_support_compression_gzip.c	Mon Dec 28 02:05:28 2009	(r201082)
@@ -411,6 +411,8 @@ gzip_filter_read(struct archive_read_fil
 			/* Consume the stream trailer; release the
 			 * decompression library. */
 			ret = consume_trailer(self);
+			if (ret < ARCHIVE_OK)
+				return (ret);
 			break;
 		default:
 			/* Return an error. */