diff options
| author | Stefan Boberg <[email protected]> | 2021-08-23 19:48:30 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-08-23 19:48:30 +0200 |
| commit | 1113a65c2fef0d39aed164d523e40139f66d6b68 (patch) | |
| tree | 5dbacfa85f6ebe92de6d7aec9ca7bc2a61833bca | |
| parent | Implemented more formalised CAS chunk filtering (with plenty of room for opti... (diff) | |
| parent | Fixed logic in IoBufferExtendedCore::Materialize() - would previously map the... (diff) | |
| download | zen-1113a65c2fef0d39aed164d523e40139f66d6b68.tar.xz zen-1113a65c2fef0d39aed164d523e40139f66d6b68.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen
| -rw-r--r-- | zencore/iobuffer.cpp | 3 | ||||
| -rw-r--r-- | zenserver/sos/sos.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index 732d4d603..b8dd62840 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -199,13 +199,12 @@ IoBufferExtendedCore::Materialize() const const uint64_t MapOffset = m_FileOffset & ~0xffffull; const uint64_t MappedOffsetDisplacement = m_FileOffset - MapOffset; - const uint64_t MapSize = (MappedOffsetDisplacement + m_DataBytes + 0xffffu) & ~0xffffull; void* MappedBase = MapViewOfFile(m_MmapHandle, /* dwDesiredAccess */ FILE_MAP_READ, /* FileOffsetHigh */ uint32_t(MapOffset >> 32), /* FileOffsetLow */ uint32_t(MapOffset & 0xffFFffFFu), - /* dwNumberOfBytesToMap */ m_DataBytes); + /* dwNumberOfBytesToMap */ m_DataBytes + MappedOffsetDisplacement); if (MappedBase == nullptr) { diff --git a/zenserver/sos/sos.cpp b/zenserver/sos/sos.cpp index 3df56abec..d52a346ae 100644 --- a/zenserver/sos/sos.cpp +++ b/zenserver/sos/sos.cpp @@ -1,3 +1,5 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + #include "sos.h" HttpCommonStructuredObjectStore::HttpCommonStructuredObjectStore() |