aboutsummaryrefslogtreecommitdiff
path: root/archival/tar.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-11-27 11:26:48 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2018-11-27 11:26:48 +0100
commitf4fc303e3679e4ab0d45f60c31f9b687f27f7452 (patch)
treec270be417b97696e3a9897eab5602ce30faf313d /archival/tar.c
parent2d217799e8f23514ad3be6a951aa928c265bc6a4 (diff)
downloadbusybox-w32-f4fc303e3679e4ab0d45f60c31f9b687f27f7452.tar.gz
busybox-w32-f4fc303e3679e4ab0d45f60c31f9b687f27f7452.tar.bz2
busybox-w32-f4fc303e3679e4ab0d45f60c31f9b687f27f7452.zip
tar: fix too eager autodetection, closes 11531
function old new delta is_suffixed_with - 54 +54 tar_main 1006 1026 +20 open_transformer 92 79 -13 config_file_action 478 458 -20 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/2 up/down: 74/-33) Total: 41 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/tar.c')
-rw-r--r--archival/tar.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/archival/tar.c b/archival/tar.c
index 1c71f7f66..6950c271d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1162,8 +1162,16 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1162 tar_handle->seek = seek_by_read; 1162 tar_handle->seek = seek_by_read;
1163 } else 1163 } else
1164 if (ENABLE_FEATURE_TAR_AUTODETECT 1164 if (ENABLE_FEATURE_TAR_AUTODETECT
1165 && ENABLE_FEATURE_SEAMLESS_LZMA
1165 && flags == O_RDONLY 1166 && flags == O_RDONLY
1166 && !(opt & OPT_ANY_COMPRESS) 1167 && !(opt & OPT_ANY_COMPRESS)
1168 && is_suffixed_with(tar_filename, ".lzma")
1169 /* We do this only for .lzma files, they have no signature.
1170 * All other compression formats are recognized in
1171 * get_header_tar() when first tar block has invalid format.
1172 * Doing it here for all filenames would falsely trigger
1173 * on e.g. tarball with 1st file named "BZh5".
1174 */
1167 ) { 1175 ) {
1168 tar_handle->src_fd = open_zipped(tar_filename, /*fail_if_not_compressed:*/ 0); 1176 tar_handle->src_fd = open_zipped(tar_filename, /*fail_if_not_compressed:*/ 0);
1169 if (tar_handle->src_fd < 0) 1177 if (tar_handle->src_fd < 0)