diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-06-22 16:27:25 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-06-22 16:27:25 +0200 |
| commit | bb4044d5964756c6635ee85e7c926a5a4ebe5190 (patch) | |
| tree | b80a4df587161e8e3ba2500f87e1b4d269c20921 | |
| parent | 07c6eff98909eb10a3cad8c27acc46edec1198ed (diff) | |
Avoid passing null reference to ComprFileReadBase::SetPosition.
| -rw-r--r-- | searchlib/src/vespa/searchlib/util/comprfile.cpp | 13 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/util/comprfile.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/searchlib/src/vespa/searchlib/util/comprfile.cpp b/searchlib/src/vespa/searchlib/util/comprfile.cpp index 61eeca6fc2d..bde246a1239 100644 --- a/searchlib/src/vespa/searchlib/util/comprfile.cpp +++ b/searchlib/src/vespa/searchlib/util/comprfile.cpp @@ -155,7 +155,7 @@ ComprFileReadBase::SetPosition(uint64_t newPosition, bool readAll, ComprFileDecodeContext &decodeContext, int &bitOffset, - FastOS_FileInterface &file, + FastOS_FileInterface *file, uint64_t &fileReadByteOffset, uint64_t fileSize, ComprBuffer &cbuf) @@ -176,7 +176,7 @@ ComprFileReadBase::SetPosition(uint64_t newPosition, readAll, decodeContext, bitOffset, - file, + *file, fileReadByteOffset, fileSize, cbuf); @@ -200,7 +200,7 @@ ComprFileReadBase::SetPosition(uint64_t newPosition, readAll, decodeContext, bitOffset, - file, + *file, fileReadByteOffset, fileSize, cbuf); @@ -221,9 +221,8 @@ ComprFileReadBase::SetPosition(uint64_t newPosition, (cbuf.getUnitBitSize() - 1)); assert(pos <= static_cast<int64_t>(fileSize)); - - file.SetPosition(pos); - assert(pos == file.GetPosition()); + file->SetPosition(pos); + assert(pos == file->GetPosition()); decodeContext.emptyBuffer(newPosition); assert(decodeContext.getBitPos(bitOffset, @@ -337,7 +336,7 @@ ComprFileReadContext::setPosition(uint64_t newPosition) _readAll, *_decodeContext, _bitOffset, - *_file, + _file, _fileReadByteOffset, _fileSize, *this); diff --git a/searchlib/src/vespa/searchlib/util/comprfile.h b/searchlib/src/vespa/searchlib/util/comprfile.h index 2ee95a53235..dc8cf6185fc 100644 --- a/searchlib/src/vespa/searchlib/util/comprfile.h +++ b/searchlib/src/vespa/searchlib/util/comprfile.h @@ -76,7 +76,7 @@ public: bool readAll, ComprFileDecodeContext &decodeContext, int &bitOffset, - FastOS_FileInterface &file, + FastOS_FileInterface *file, uint64_t &fileReadByteOffset, uint64_t fileSize, ComprBuffer &cbuf); |