From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 14 Aug 2014 08:04:54 +0000 (+0900)
Subject: Avoid an analyzer error "Dereference of null pointer",
X-Git-Tag: v3.1.900a~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d2939fd3d5cbd08486317ae28f28eff51d8e092;p=thirdparty%2Flibarchive.git

Avoid an analyzer error "Dereference of null pointer",
which will not happen but analyzer claims.
---

diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
index 2a4b83da8..0cc73261d 100644
--- a/libarchive/archive_read_support_format_7zip.c
+++ b/libarchive/archive_read_support_format_7zip.c
@@ -640,7 +640,7 @@ archive_read_format_7zip_read_header(struct archive_read *a,
 	}
 	zip_entry = zip->entry;
 
-	if (zip->entries_remaining <= 0)
+	if (zip->entries_remaining <= 0 || zip_entry == NULL)
 		return ARCHIVE_EOF;
 	--zip->entries_remaining;