From owner-svn-src-all@FreeBSD.ORG  Tue Dec 29 05:30:23 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 D4ED0106568B;
	Tue, 29 Dec 2009 05:30:23 +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 C12788FC13;
	Tue, 29 Dec 2009 05:30:23 +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 nBT5UN8h011934;
	Tue, 29 Dec 2009 05:30:23 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBT5UNwM011932;
	Tue, 29 Dec 2009 05:30:23 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200912290530.nBT5UNwM011932@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Tue, 29 Dec 2009 05:30:23 +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: r201157 - 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: Tue, 29 Dec 2009 05:30:23 -0000

Author: kientzle
Date: Tue Dec 29 05:30:23 2009
New Revision: 201157
URL: http://svn.freebsd.org/changeset/base/201157

Log:
  Catch decompression failures earlier.  In particular, this gives
  immediate feedback if we fail to fork an external decompression program.

Modified:
  head/lib/libarchive/archive_read.c

Modified: head/lib/libarchive/archive_read.c
==============================================================================
--- head/lib/libarchive/archive_read.c	Tue Dec 29 05:28:28 2009	(r201156)
+++ head/lib/libarchive/archive_read.c	Tue Dec 29 05:30:23 2009	(r201157)
@@ -354,6 +354,7 @@ build_stream(struct archive_read *a)
 	int number_bidders, i, bid, best_bid;
 	struct archive_read_filter_bidder *bidder, *best_bidder;
 	struct archive_read_filter *filter;
+	ssize_t avail;
 	int r;
 
 	for (;;) {
@@ -392,6 +393,13 @@ build_stream(struct archive_read *a)
 			free(filter);
 			return (r);
 		}
+		/* Verify the filter by asking it for some data. */
+		__archive_read_filter_ahead(filter, 1, &avail);
+		if (avail < 0) {
+			/* If the read failed, bail out now. */
+			free(filter);
+			return (avail);
+		}
 		a->filter = filter;
 	}
 }