From owner-svn-src-all@FreeBSD.ORG  Fri Apr 17 00:58:45 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 781F6106566C;
	Fri, 17 Apr 2009 00:58:45 +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 6537F8FC24;
	Fri, 17 Apr 2009 00:58:45 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3H0wicE099427;
	Fri, 17 Apr 2009 00:58:44 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3H0wi8q099426;
	Fri, 17 Apr 2009 00:58:44 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200904170058.n3H0wi8q099426@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Fri, 17 Apr 2009 00:58:44 +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: r191175 - 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: Fri, 17 Apr 2009 00:58:46 -0000

Author: kientzle
Date: Fri Apr 17 00:58:44 2009
New Revision: 191175
URL: http://svn.freebsd.org/changeset/base/191175

Log:
  LZW bugfix:  when we hit end-of-file, return an invalid code.

Modified:
  head/lib/libarchive/archive_read_support_compression_compress.c

Modified: head/lib/libarchive/archive_read_support_compression_compress.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_compress.c	Fri Apr 17 00:57:11 2009	(r191174)
+++ head/lib/libarchive/archive_read_support_compression_compress.c	Fri Apr 17 00:58:44 2009	(r191175)
@@ -278,7 +278,7 @@ compress_filter_read(struct archive_read
 			*p++ = *--state->stackp;
 		} else {
 			ret = next_code(self);
-			if (ret == ARCHIVE_EOF)
+			if (ret == -1)
 				state->end_of_stream = ret;
 			else if (ret != ARCHIVE_OK)
 				return (ret);
@@ -424,7 +424,7 @@ getbits(struct archive_read_filter *self
 			    = __archive_read_filter_ahead(self->upstream,
 				1, &ret);
 			if (ret == 0)
-				return (ARCHIVE_EOF);
+				return (-1);
 			if (ret < 0 || state->next_in == NULL)
 				return (ARCHIVE_FATAL);
 			state->avail_in = ret;