diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-02 12:15:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 12:15:33 +0200 |
| commit | 764c470aac9cc527676b7a8d330b996019de93d5 (patch) | |
| tree | 867c10b7bd4159edd88a16601c1243e0ece51dcf | |
| parent | 2a59cbffa7cc31f0d0851fa998d0cb21ee7cfbf5 (diff) | |
| parent | 34d017f81f3d19d0e9522d26434ebf3f5aea33b8 (diff) | |
Merge pull request #10165 from vespa-engine/toregge/use-ptrdiff-max-in-decodecontext64base
Don't use pointer arithmetics with nullptr.
| -rw-r--r-- | searchlib/src/vespa/searchlib/bitcompression/compression.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/searchlib/src/vespa/searchlib/bitcompression/compression.h b/searchlib/src/vespa/searchlib/bitcompression/compression.h index de206d33b8d..350932263c3 100644 --- a/searchlib/src/vespa/searchlib/bitcompression/compression.h +++ b/searchlib/src/vespa/searchlib/bitcompression/compression.h @@ -1143,7 +1143,7 @@ public: DecodeContext64Base() : search::ComprFileDecodeContext(), _valI(nullptr), - _valE(static_cast<const uint64_t *>(nullptr) - 1), + _valE(reinterpret_cast<const uint64_t *>(PTRDIFF_MAX)), _realValE(nullptr), _val(0), _cacheInt(0), @@ -1325,7 +1325,7 @@ public: DecodeContext64(const uint64_t *compr, int bitOffset) : DecodeContext64Base(compr + 1, - static_cast<const uint64_t *>(nullptr) - 1, + reinterpret_cast<const uint64_t *>(PTRDIFF_MAX), nullptr, 0, EC::bswap(*compr), |