From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 21 Jun 2016 00:04:16 +0000 (+0200)
Subject: libarchive: fix xmalloc_open_zipped_read_close()
X-Git-Tag: 1_25_0~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=10c0e9178606bb71a071c27dcda3fd2787e8303b;p=oweals%2Fbusybox.git

libarchive: fix xmalloc_open_zipped_read_close()

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index a3018d9ec..ac7e5db95 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -331,6 +331,9 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
 		}
 	} else {
 		/* File is not compressed */
+//FIXME: avoid seek
+		xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
+		xstate->signature_skipped = 0;
 		image = xmalloc_read(xstate->src_fd, maxsz_p);
 	}