re-ordered parenthesis

to avoid mixing && and &
as suggested by @terrelln
This commit is contained in:
Cyan4973 2018-04-23 19:26:02 -07:00
parent 644b7bd2b6
commit 44bff3fd3b

View File

@ -1538,8 +1538,9 @@ LZ4_FORCE_INLINE int LZ4_decompress_generic(
* NOTE: The loop begins with a read, so we must have one byte left at the end. */ * NOTE: The loop begins with a read, so we must have one byte left at the end. */
if (endOnInput if (endOnInput
&& ((ip + 14 /*maxLL*/ + 2 /*offset*/ < iend) && ((ip + 14 /*maxLL*/ + 2 /*offset*/ < iend)
& (op + 14 /*maxLL*/ + 18 /*maxML*/ <= oend)) & (op + 14 /*maxLL*/ + 18 /*maxML*/ <= oend)
& ((token < (15<<ML_BITS)) & ((token & ML_MASK) != 15)) ) { & (token < (15<<ML_BITS))
& ((token & ML_MASK) != 15) ) ) {
size_t const ll = token >> ML_BITS; size_t const ll = token >> ML_BITS;
size_t const off = LZ4_readLE16(ip+ll); size_t const off = LZ4_readLE16(ip+ll);
const BYTE* const matchPtr = op + ll - off; /* pointer underflow risk ? */ const BYTE* const matchPtr = op + ll - off; /* pointer underflow risk ? */