From 3eb7cf9dd5b90a074f741234225d7de51ad88774 Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sun, 12 May 2024 17:14:43 +0300 Subject: [PATCH] xz: Move the setting of "check" in coder_set_compression_settings() It's more logical to do it in the beginning instead of in the middle of the filter chain handling. Fixes: d6af7f347077b22403133239592e478931307759 (cherry picked from commit 32500dfaadae2ea36fda2e17b49ae7d9ac1acf52) --- src/xz/coder.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/xz/coder.c b/src/xz/coder.c index 0bc8b4ff..33cdfedc 100644 --- a/src/xz/coder.c +++ b/src/xz/coder.c @@ -290,6 +290,15 @@ coder_set_compression_settings(void) assert(opt_format != FORMAT_LZIP); #endif + // The default check type is CRC64, but fallback to CRC32 + // if CRC64 isn't supported by the copy of liblzma we are + // using. CRC32 is always supported. + if (check_default) { + check = LZMA_CHECK_CRC64; + if (!lzma_check_is_supported(check)) + check = LZMA_CHECK_CRC32; + } + #ifdef HAVE_ENCODERS if (opt_block_list != NULL) { // args.c ensures these. @@ -332,15 +341,6 @@ coder_set_compression_settings(void) } #endif - // The default check type is CRC64, but fallback to CRC32 - // if CRC64 isn't supported by the copy of liblzma we are - // using. CRC32 is always supported. - if (check_default) { - check = LZMA_CHECK_CRC64; - if (!lzma_check_is_supported(check)) - check = LZMA_CHECK_CRC32; - } - // Options for LZMA1 or LZMA2 in case we are using a preset. static lzma_options_lzma opt_lzma;