diff options
| author | Martin Ridgers <[email protected]> | 2021-11-16 14:41:55 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-16 14:41:55 +0100 |
| commit | 2f45b5f9389d18c795a83f7c08a2e3999940e4d8 (patch) | |
| tree | 35f771b5d9693ebf880ed68ab3db721321d1c9de /zencore | |
| parent | Changed SpawnServer() over to use zen::CreateProc() (diff) | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-2f45b5f9389d18c795a83f7c08a2e3999940e4d8.tar.xz zen-2f45b5f9389d18c795a83f7c08a2e3999940e4d8.zip | |
Merged main
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/compress.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/zencore/compress.cpp b/zencore/compress.cpp index a1a6731ff..35a5acb3a 100644 --- a/zencore/compress.cpp +++ b/zencore/compress.cpp @@ -693,6 +693,11 @@ ValidBufferOrEmpty(BufferType&& CompressedData) CompositeBuffer CopyCompressedRange(const BufferHeader& Header, const CompositeBuffer& CompressedData, uint64_t RawOffset, uint64_t RawSize) { + if (Header.TotalRawSize < RawOffset + RawSize) + { + return CompositeBuffer(); + } + if (Header.Method == CompressionMethod::None) { UniqueBuffer NewCompressedData = UniqueBuffer::Alloc(RawSize); @@ -862,9 +867,11 @@ CompressedBuffer CompressedBuffer::CopyRange(uint64_t RawOffset, uint64_t RawSize) const { using namespace detail; - const BufferHeader Header = BufferHeader::Read(CompressedData); - CompressedBuffer Range; - Range.CompressedData = CopyCompressedRange(Header, CompressedData, RawOffset, RawSize); + const BufferHeader Header = BufferHeader::Read(CompressedData); + const uint64_t TotalRawSize = RawSize < ~uint64_t(0) ? RawSize : Header.TotalRawSize - RawOffset; + + CompressedBuffer Range; + Range.CompressedData = CopyCompressedRange(Header, CompressedData, RawOffset, TotalRawSize); return Range; } |