From: Sean Purcell <me@seanp.xyz>
Date: Wed, 26 Apr 2017 05:24:07 +0000 (-0700)
Subject: zstd: Don't bid on skippable frames
X-Git-Tag: v3.3.3~44^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45232160e38fd41827712c0e8577835cb5287fd8;p=thirdparty%2Flibarchive.git

zstd: Don't bid on skippable frames
---

diff --git a/libarchive/archive_read_support_filter_zstd.c b/libarchive/archive_read_support_filter_zstd.c
index ebe1a2224..f8a759068 100644
--- a/libarchive/archive_read_support_filter_zstd.c
+++ b/libarchive/archive_read_support_filter_zstd.c
@@ -119,7 +119,6 @@ zstd_bidder_bid(struct archive_read_filter_bidder *self,
 
 	/* Zstd frame magic values */
 	const unsigned zstd_magic = 0xFD2FB528U;
-	const unsigned zstd_skippable_magic = 0x184D2A50U;
 
 	(void) self; /* UNUSED */
 
@@ -128,8 +127,7 @@ zstd_bidder_bid(struct archive_read_filter_bidder *self,
 		return (0);
 
 	prefix = archive_le32dec(buffer);
-	if (prefix == zstd_magic ||
-	    (prefix & 0xFFFFFFFFU) == zstd_skippable_magic)
+	if (prefix == zstd_magic)
 		return (32);
 
 	return (0);