From afb2dbec3d857b026486b75e42a4728e12d234cb Mon Sep 17 00:00:00 2001 From: Jia Tan Date: Thu, 11 May 2023 00:09:41 +0800 Subject: xz: Validate --flush-timeout for all specified filter chains. --- src/xz/coder.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'src/xz/coder.c') diff --git a/src/xz/coder.c b/src/xz/coder.c index a334e1e2..7cb286b2 100644 --- a/src/xz/coder.c +++ b/src/xz/coder.c @@ -376,15 +376,23 @@ coder_set_compression_settings(void) // from the filter chain. Currently the threaded encoder doesn't // support LZMA_SYNC_FLUSH so single-threaded mode must be used. if (opt_mode == MODE_COMPRESS && opt_flush_timeout != 0) { - for (size_t i = 0; i < filters_count; ++i) { - switch (default_filters[i].id) { - case LZMA_FILTER_LZMA2: - case LZMA_FILTER_DELTA: - break; + for (uint32_t i = 0; i < ARRAY_SIZE(filters); ++i) { + if (!(filters_init_mask & (1 << i))) + continue; - default: - message_fatal(_("The filter chain is " - "incompatible with --flush-timeout")); + const lzma_filter *fc = filters[i]; + for (size_t j = 0; fc[j].id != LZMA_VLI_UNKNOWN; j++) { + switch (fc[j].id) { + case LZMA_FILTER_LZMA2: + case LZMA_FILTER_DELTA: + break; + + default: + message_fatal(_("Filter chain %u is " + "incompatible with " + "--flush-timeout"), + (unsigned)i); + } } } -- cgit v1.2.3