diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-06-20 11:06:42 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-06-20 11:06:42 +0200 |
commit | 984b0a613aaf1cdf48c2e2af08c8466a7bad8307 (patch) | |
tree | 57b512d3843221b92da936b46abd238d1a036a94 /archival/bbunzip.c | |
parent | ecf25cb5bce27ca5820e2895d8458f38c406d105 (diff) | |
download | busybox-w32-984b0a613aaf1cdf48c2e2af08c8466a7bad8307.tar.gz busybox-w32-984b0a613aaf1cdf48c2e2af08c8466a7bad8307.tar.bz2 busybox-w32-984b0a613aaf1cdf48c2e2af08c8466a7bad8307.zip |
libarchive: fix xmalloc_open_zipped_read_close() on NOMMU
The somewhat new "unpack in memory" code was broken
for xmalloc_open_zipped_read_close() on NOMMU: we seek back
over signature, but then expect it to be already consumed.
Stop seeking back in this case.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/bbunzip.c')
-rw-r--r-- | archival/bbunzip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c index b4f754e0b..07ef8617e 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c | |||
@@ -121,7 +121,7 @@ int FAST_FUNC bbunpack(char **argv, | |||
121 | 121 | ||
122 | if (!(option_mask32 & SEAMLESS_MAGIC)) { | 122 | if (!(option_mask32 & SEAMLESS_MAGIC)) { |
123 | init_transformer_state(&xstate); | 123 | init_transformer_state(&xstate); |
124 | xstate.check_signature = 1; | 124 | xstate.signature_skipped = 0; |
125 | /*xstate.src_fd = STDIN_FILENO; - already is */ | 125 | /*xstate.src_fd = STDIN_FILENO; - already is */ |
126 | xstate.dst_fd = STDOUT_FILENO; | 126 | xstate.dst_fd = STDOUT_FILENO; |
127 | status = unpacker(&xstate); | 127 | status = unpacker(&xstate); |