]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix the potential of a dereference of null pointer.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sat, 4 Oct 2014 14:56:57 +0000 (23:56 +0900)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Sat, 4 Oct 2014 15:15:45 +0000 (00:15 +0900)
libarchive/archive_read_support_filter_xz.c

index 7bda2636351df1722b6b8517ee33a69969cbce72..4e0a95feeb0f0a313392f99c2794e71c670e41bd 100644 (file)
@@ -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);