From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 25 May 2009 05:02:50 +0000 (-0400)
Subject: Merge r1093 from trunk: Correctly account for
X-Git-Tag: v2.7.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ef93f88e05a4766bb0d3705271d1399150c3f26;p=thirdparty%2Flibarchive.git

Merge r1093 from trunk: Correctly account for
"extra data" field when reading gzip headers.
In particular, this fixes reading gzip files that
have been signed with the OpenBSD "gzsig" program.

SVN-Revision: 1104
---

diff --git a/libarchive/archive_read_support_compression_gzip.c b/libarchive/archive_read_support_compression_gzip.c
index 222247893..cd21c6129 100644
--- a/libarchive/archive_read_support_compression_gzip.c
+++ b/libarchive/archive_read_support_compression_gzip.c
@@ -148,6 +148,7 @@ peek_at_header(struct archive_read_filter *filter, int *pbits)
 		if (p == NULL)
 			return (0);
 		len += ((int)p[len + 1] << 8) | (int)p[len];
+		len += 2;
 	}
 
 	/* Null-terminated optional filename. */