From: Tim Kientzle <kientzle@gmail.com>
Date: Tue, 10 Jan 2012 07:05:12 +0000 (-0500)
Subject: Merge from trunk: always-true comparison.
X-Git-Tag: v3.0.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834380d49276dd2b23faaad6b0ba278d79486124;p=thirdparty%2Flibarchive.git

Merge from trunk: always-true comparison.

SVN-Revision: 4115
---

diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index 7fa4cda37..e211e67be 100644
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -1382,7 +1382,7 @@ decompress(struct archive_read *a, struct _7zip *zip,
 		uint64_t flush_bytes;
 
 		if (!zip->ppmd7_valid || zip->ppmd7_stat < 0 ||
-		    t_avail_in < 0 || t_avail_out <= 0) {
+		    t_avail_out <= 0) {
 			archive_set_error(&(a->archive),
 			    ARCHIVE_ERRNO_MISC,
 			    "Decompression internal error");