From 748b6381a8bd9eba48a2cb70eace21d0456c2202 Mon Sep 17 00:00:00 2001 From: Håvard Pettersen Date: Mon, 20 Jun 2022 10:04:58 +0000 Subject: avoid undefined shift --- searchlib/src/vespa/searchlib/bitcompression/compression.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'searchlib') diff --git a/searchlib/src/vespa/searchlib/bitcompression/compression.cpp b/searchlib/src/vespa/searchlib/bitcompression/compression.cpp index 5ac506e4fc2..b60250256f4 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/compression.cpp +++ b/searchlib/src/vespa/searchlib/bitcompression/compression.cpp @@ -98,8 +98,7 @@ EncodeContext64EBase::writeBits(uint64_t data, uint32_t length) // Shift new bits into cacheInt _cacheInt |= (data << (64 - _cacheFree)); *_valI++ = bswap(_cacheInt); - - data >>= _cacheFree; + data = (_cacheFree < 64) ? data >> _cacheFree : 0; // Initialize variables for receiving new bits length -= _cacheFree; _cacheInt = 0; @@ -194,9 +193,9 @@ writeBits(const uint64_t *bits, uint32_t bitOffset, uint32_t bitLength) if (bitOffset + bitLength < 64) { uint32_t length = bitLength; if (bigEndian) { - uint64_t data = (EC::bswap(*bits) >> - (64 - bitOffset - length)) & - CodingTables::_intMask64[length]; + uint64_t data = ((bitOffset + length) > 0) + ? (EC::bswap(*bits) >> (64 - bitOffset - length)) & CodingTables::_intMask64[length] + : 0; UC64BE_WRITEBITS_NS(o, EC); } else { uint64_t data = (EC::bswap(*bits) >> bitOffset) & -- cgit v1.2.3