]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Avoid an analyzer error "Dereference of null pointer",
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Thu, 14 Aug 2014 08:04:54 +0000 (17:04 +0900)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Thu, 14 Aug 2014 08:04:54 +0000 (17:04 +0900)
which will not happen but analyzer claims.

libarchive/archive_read_support_format_7zip.c

index 2a4b83da8dcf0f08ab056267d71fb1b19e239b7a..0cc73261d493c303d0322cbf56fc069ab83b98db 100644 (file)
@@ -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;