diff options
| author | Dan Engelbrecht <[email protected]> | 2022-06-14 15:18:47 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-14 15:18:47 -0700 |
| commit | 3c6f831b8995b296e0179404e67e1d6e2187065a (patch) | |
| tree | 67297329596bb3fca10a879a0dddfac9c9d8a7af /zenserver/frontend/frontend.cpp | |
| parent | added _WIN32_WINNT define to be consistent with xmake file (diff) | |
| parent | Make sure we don't try to create a ZipFS IoBuffer of zero size (diff) | |
| download | zen-3c6f831b8995b296e0179404e67e1d6e2187065a.tar.xz zen-3c6f831b8995b296e0179404e67e1d6e2187065a.zip | |
Merge pull request #129 from EpicGames/de/better-iterate-chunksv0.1.4-pre2
Improved BlockStore::IterateChunks
Diffstat (limited to 'zenserver/frontend/frontend.cpp')
| -rw-r--r-- | zenserver/frontend/frontend.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/zenserver/frontend/frontend.cpp b/zenserver/frontend/frontend.cpp index 842587708..e203e0631 100644 --- a/zenserver/frontend/frontend.cpp +++ b/zenserver/frontend/frontend.cpp @@ -26,7 +26,7 @@ FindZipFsInBinary(const IoBuffer& BinBuffer) uintptr_t Cursor = uintptr_t(BinBuffer.GetData()); size_t BinSize = 0; - uint32_t Magic = *(uint32_t*)(BinBuffer.GetData()); + uint32_t Magic = *(uint32_t*)(Cursor); #if ZEN_PLATFORM_LINUX if (Magic == 0x464c457f) { @@ -134,6 +134,12 @@ FindZipFsInBinary(const IoBuffer& BinBuffer) return {}; } + size_t ZipFsSize = BinBuffer.Size() - BinSize; + if (!ZipFsSize) + { + return {}; + } + return IoBuffer(BinBuffer, BinSize); } |