From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sat, 4 Oct 2014 14:56:57 +0000 (+0900)
Subject: Fix the potential of a dereference of null pointer.
X-Git-Tag: v3.1.900a~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6002e4603aa8034f8e17d48e88041f8761952ef3;p=thirdparty%2Flibarchive.git

Fix the potential of a dereference of null pointer.
---

diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c
index 7bda26363..4e0a95fee 100644
--- a/libarchive/archive_read_support_filter_xz.c
+++ b/libarchive/archive_read_support_filter_xz.c
@@ -627,7 +627,7 @@ lzip_tail(struct archive_read_filter *self)
 	f = __archive_read_filter_ahead(self->upstream, tail, &avail_in);
 	if (f == NULL && avail_in < 0)
 		return (ARCHIVE_FATAL);
-	if (avail_in < tail) {
+	if (f == NULL || avail_in < tail) {
 		archive_set_error(&self->archive->archive, ARCHIVE_ERRNO_MISC,
 		    "Lzip: Remaining data is less bytes");
 		return (ARCHIVE_FAILED);