zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-21 00:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ZoneCodeGenerator: Fix fastfile offsets being wrong by 1 due to not respecting that all offsets are moved by 1

Browse Source
This commit is contained in:
Jan 2019-11-15 14:52:53 +01:00
parent 51862d8596
commit cd93106c19
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp
View File

@ -191,8 +191,12 @@ void** XBlockInputStream::InsertPointer()
void* XBlockInputStream::ConvertOffsetToPointer(const void* offset)
{
const block_t blockNum = reinterpret_cast<uintptr_t>(offset) >> (sizeof(offset) * 8 - m_block_bit_count);
const size_t blockOffset = reinterpret_cast<uintptr_t>(offset) & (UINTPTR_MAX >> m_block_bit_count);
// -1 because otherwise Block 0 Offset 0 would be just 0 which is already used to signalize a nullptr.
// So all offsets are moved by 1.
auto offsetInt = reinterpret_cast<uintptr_t>(offset) - 1;
const block_t blockNum = offsetInt >> (sizeof(offsetInt) * 8 - m_block_bit_count);
const size_t blockOffset = offsetInt & (UINTPTR_MAX >> m_block_bit_count);
if(blockNum < 0 || blockNum >= static_cast<block_t>(m_blocks.size()))
{
@ -211,8 +215,11 @@ void* XBlockInputStream::ConvertOffsetToPointer(const void* offset)
void* XBlockInputStream::ConvertOffsetToAlias(const void* offset)
{
const block_t blockNum = reinterpret_cast<uintptr_t>(offset) >> (sizeof(offset) * 8 - m_block_bit_count);
const size_t blockOffset = reinterpret_cast<uintptr_t>(offset) & (UINTPTR_MAX >> m_block_bit_count);
// For details see ConvertOffsetToPointer
auto offsetInt = reinterpret_cast<uintptr_t>(offset) - 1;
const block_t blockNum = offsetInt >> (sizeof(offsetInt) * 8 - m_block_bit_count);
const size_t blockOffset = offsetInt & (UINTPTR_MAX >> m_block_bit_count);
if(blockNum < 0 || blockNum >= static_cast<block_t>(m_blocks.size()))
{