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 2222478935637c8a42a06221d208e6abac04dcf9..cd21c61293b9a8b14e4bb4494bf25a5f60fb03dd 100644 (file)
--- 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. */