From 8bd7c8a7cd615aa09344bec9fe04287c70a44161 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Wed, 2 Mar 2005 05:37:10 +0000 Subject: MFC 1.8: Correctly skip gzip "Extra Data" field, fixing bsdtar (and hence pkg_add) for signed packages. --- lib/libarchive/archive_read_support_compression_gzip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libarchive/archive_read_support_compression_gzip.c') diff --git a/lib/libarchive/archive_read_support_compression_gzip.c b/lib/libarchive/archive_read_support_compression_gzip.c index 50da5ba9158b..8a80866feac0 100644 --- a/lib/libarchive/archive_read_support_compression_gzip.c +++ b/lib/libarchive/archive_read_support_compression_gzip.c @@ -426,7 +426,7 @@ drive_decompressor(struct archive *a, struct private_data *state) */ case 11: /* Optional Extra: Second byte of Length. */ if ((flags & 4)) { - count = (count << 8) | (255 & (int)b); + count = (0xff00 & ((int)b << 8)) | count; header_state = 12; break; } -- cgit v1.3