diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/SBaseFileTable.cpp | 2 | ||||
| -rw-r--r-- | src/SFileListFile.cpp | 23 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp index 5d7d973..fbe10ee 100644 --- a/src/SBaseFileTable.cpp +++ b/src/SBaseFileTable.cpp @@ -618,7 +618,7 @@ static TMPQHash * GetHashEntryLocale(TMPQArchive * ha, const char * szFileName, while(pHash != NULL) { // If the locales match, return it - if(lcLocale == 0 && lcLocale == pHash->lcLocale) + if(lcLocale == pHash->lcLocale) return pHash; // If we found neutral hash, remember it diff --git a/src/SFileListFile.cpp b/src/SFileListFile.cpp index f0d2122..7919475 100644 --- a/src/SFileListFile.cpp +++ b/src/SFileListFile.cpp @@ -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 |