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

+ Too large listfiles are ignored on malformed maps

Browse Source
This commit is contained in:
unknown
2015-05-13 18:13:06 +02:00
parent c45446094e
commit 58166d6ba7
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/SFileListFile.cpp
View File

@@ -471,26 +471,37 @@ static int SFileAddInternalListFile(
TMPQArchive * ha,
HANDLE hMpq)
{
TMPQArchive * haMpq = (TMPQArchive *)hMpq;
TMPQHash * pFirstHash;
TMPQHash * pHash;
HANDLE hListFile;
DWORD dwFileSize;
LCID lcSaveLocale = lcFileLocale;
bool bIgnoreListFile = false;
int nError = ERROR_SUCCESS;
// If there is hash table, we need to support multiple listfiles
// with different locales (BrooDat.mpq)
if(haMpq->pHashTable != NULL)
if(ha->pHashTable != NULL)
{
pFirstHash = pHash = GetFirstHashEntry(haMpq, LISTFILE_NAME);
pFirstHash = pHash = GetFirstHashEntry(ha, LISTFILE_NAME);
while(nError == ERROR_SUCCESS && pHash != NULL)
{
{
// Set the prefered locale to that from list file
SFileSetLocale(pHash->lcLocale);
// Attempt to open the file with that locale
if(SFileOpenFileEx(hMpq, LISTFILE_NAME, 0, &hListFile))
{
// If the archive is a malformed map, ignore too large listfiles
if(ha->dwFlags & MPQ_FLAG_MALFORMED)
{
dwFileSize = SFileGetFileSize(hListFile, NULL);
bIgnoreListFile = (dwFileSize > 0x40000);
}
// Add the data from the listfile to MPQ
nError = SFileAddArbitraryListFile(ha, hListFile);
if(bIgnoreListFile == false)
nError = SFileAddArbitraryListFile(ha, hListFile);
SFileCloseFile(hListFile);
}
@@ -498,7 +509,7 @@ static int SFileAddInternalListFile(
SFileSetLocale(lcSaveLocale);
// Move to the next hash
pHash = GetNextHashEntry(haMpq, pFirstHash, pHash);
pHash = GetNextHashEntry(ha, pFirstHash, pHash);
}
}
else