]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix of MSZIP signature parsing
authorAlexander Chaikovsky <sskr33@gmail.com>
Sat, 20 Apr 2019 22:17:29 +0000 (01:17 +0300)
committerMartin Matuska <martin@matuska.org>
Tue, 7 May 2019 21:38:46 +0000 (23:38 +0200)
Fixes #1174

libarchive/archive_read_support_format_cab.c

index e5ff5a12cd9b4ba285acdecc8acc78613bdae294..a6475308e016d3b67811bdb3c8f63a6d6b68d36e 100644 (file)
@@ -1509,8 +1509,8 @@ cab_read_ahead_cfdata_deflate(struct archive_read *a, ssize_t *avail)
                        }
                        if (mszip == 1 && cab->stream.next_in[0] != 0x4b)
                                goto nomszip;
-                       else if (cab->stream.next_in[0] != 0x43 ||
-                           cab->stream.next_in[1] != 0x4b)
+                       else if (mszip == 2 && (cab->stream.next_in[0] != 0x43 ||
+                           cab->stream.next_in[1] != 0x4b))
                                goto nomszip;
                        cab->stream.next_in += mszip;
                        cab->stream.avail_in -= mszip;