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

+ Adding files into MPQs that have BlockTableSize > HashTableSize is not allowed

Browse Source 
+ Compacting MPQs that have BlockTableSize > HashTableSize is allowed
This commit is contained in:
Ladislav Zezula
2014-12-23 15:04:35 +01:00
parent 48b5cb606e
commit e9842c38cf
3 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/SBaseFileTable.cpp
View File

@@ -2629,7 +2629,6 @@ int RebuildFileTable(TMPQArchive * ha, DWORD dwNewHashTableSize, DWORD dwNewMaxF
// The new hash table size must be greater or equal to the current hash table size
assert(dwNewHashTableSize >= ha->pHeader->dwHashTableSize);
assert(dwNewMaxFileCount >= ha->dwFileTableSize);
// The new hash table size must be a power of two
assert((dwNewHashTableSize & (dwNewHashTableSize - 1)) == 0);
@@ -2676,7 +2675,11 @@ int RebuildFileTable(TMPQArchive * ha, DWORD dwNewHashTableSize, DWORD dwNewMaxF
if(ha->pHashTable != NULL)
{
pHash = AllocateHashEntry(ha, pFileEntry);
assert(pHash != NULL);
if(pHash == NULL)
{
nError = ERROR_DISK_FULL;
break;
}
}
// Move the file entry by one