diff --git a/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.cpp b/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.cpp index 918528ea..58a4e6b3 100644 --- a/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.cpp +++ b/src/ObjLoading/ObjContainer/IPak/IPakEntryReadStream.cpp @@ -182,11 +182,11 @@ bool IPakEntryReadStream::AdjustChunkBufferWindowForBlockHeader(const IPakDataBl bool IPakEntryReadStream::NextBlock() { + m_pos = AlignForward(m_pos, sizeof(IPakDataBlockHeader)); + if (m_pos >= m_end_pos) return false; - m_pos = AlignForward(m_pos, sizeof(IPakDataBlockHeader)); - const auto chunkStartPos = AlignBackwards(m_pos, IPAK_CHUNK_SIZE); const auto blockOffsetInChunk = static_cast(m_pos - chunkStartPos);