]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Fixes decompressor when using -Wshorten-64-to-32 (#2062)
authorCarl Woffenden <cwoffenden@gmail.com>
Fri, 3 Apr 2020 09:55:29 +0000 (11:55 +0200)
committerGitHub <noreply@github.com>
Fri, 3 Apr 2020 09:55:29 +0000 (02:55 -0700)
Spotted on iOS when building with `-Wshorten-64-to-32` (since `__builtin_expect` returns a `long`).

lib/decompress/huf_decompress.c

index 6cf9c4fddd26ebf10834902fa5c421f02561916e..a2478b4c78adc9433a72b7e45f0415ddfb868195 100644 (file)
@@ -835,7 +835,7 @@ HUF_decompress4X2_usingDTable_internal_body(
             HUF_DECODE_SYMBOLX2_0(op2, &bitD2);
             HUF_DECODE_SYMBOLX2_0(op3, &bitD3);
             HUF_DECODE_SYMBOLX2_0(op4, &bitD4);
-            endSignal = LIKELY(
+            endSignal = (U32)LIKELY(
                         (BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished)
                       & (BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished)
                       & (BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished)