Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-01-20 14:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ Fixed correction of table index

Browse Source
This commit is contained in:
Ladislav Zezula
2016-03-29 15:35:16 +02:00
parent ed195c0d72
commit 881ea60a01
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/SBaseFileTable.cpp
View File

@@ -591,10 +591,12 @@ static bool IsValidHashEntry1(TMPQArchive * ha, TMPQHash * pHash, TMPQBlock * pB
ULONGLONG ByteOffset;
TMPQBlock * pBlock = pBlockTable + pHash->dwBlockIndex;
// Storm.dll does not perform this check. However, if there will
// be an entry with (dwBlockIndex > dwBlockTableSize), the game would crash
// Hence we assume that dwBlockIndex must be less than dwBlockTableSize
if(pHash->dwBlockIndex < ha->pHeader->dwBlockTableSize)
// We need to mask out the upper 4 bits of the block table index.
// This is because it gets shifted out when calculating block table offset
// BlockTableOffset = pHash->dwBlockIndex * 0x10
// Malformed MPQ maps may contain invalid entries
// Note that Storm.dll does not perfom this check
if((pHash->dwBlockIndex & 0x0FFFFFFF) < ha->pHeader->dwBlockTableSize)
{
// Check whether this is an existing file
// Also we do not allow to be file size greater than 2GB
@@ -685,12 +687,6 @@ static TMPQHash * DefragmentHashTable(
// Parse the hash table and move the entries to the begin of it
for(pSource = pHashTable; pSource < pHashTableEnd; pSource++)
{
// We need to mask out the upper 4 bits of the block table index.
// This is because it gets shifted out when calculating block table offset
// BlockTableOffset = pHash->dwBlockIndex * 0x10
// Malformed MPQ maps may contain invalid entries
pSource->dwBlockIndex &= 0x0FFFFFFF;
// Check whether this is a valid hash table entry
if(IsValidHashEntry1(ha, pSource, pBlockTable))
{
@@ -771,12 +767,6 @@ static int BuildFileTableFromBlockTable(
pHashTableEnd = ha->pHashTable + pHeader->dwHashTableSize;
for(pHash = ha->pHashTable; pHash < pHashTableEnd; pHash++)
{
// We need to mask out the upper 4 bits of the block table index.
// This is because it gets shifted out when calculating block table offset
// BlockTableOffset = pHash->dwBlockIndex * 0x10
// Malformed MPQ maps may contain invalid entries
pHash->dwBlockIndex &= 0x0FFFFFFF;
//
// We need to properly handle these cases:
// - Multiple hash entries (same file name) point to the same block entry