From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 26 May 2019 11:43:06 +0000 (+0200)
Subject: libarchive: treat one "FIXME: avoid seek", take 2
X-Git-Tag: 1_31_0~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cc71f79c1e5905992f4ba5cd6fe3466fe276737d;p=oweals%2Fbusybox.git

libarchive: treat one "FIXME: avoid seek", take 2

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

diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 97bcc32f0..775bb580d 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -352,13 +352,13 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
 		 *   read(4, "LF\2\1\1\0\0\0\0"...
 		 * ...and we avoided seeking on the fd! :)
 		 */
-		xstate->signature_skipped = 0;
 		image = xmalloc_read_with_initial_buf(
 			xstate->src_fd,
 			maxsz_p,
 			xmemdup(&xstate->magic, xstate->signature_skipped),
 			xstate->signature_skipped
 		);
+		xstate->signature_skipped = 0;
 	}
 
 	if (!image)