Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in StormLib

Browse Source
This commit is contained in:
ariel-
2016-01-10 18:57:31 -03:00
parent 6d04b6ecc6
commit 694c89d76d
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dep/StormLib/StormLib-v1.0.hotfix1.diff Normal file
View File

@@ -0,0 +1,22 @@
dep/StormLib/src/SFileFindFile.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dep/StormLib/src/SFileFindFile.cpp b/dep/StormLib/src/SFileFindFile.cpp
index 337be7d..ca745b9 100644
--- a/dep/StormLib/src/SFileFindFile.cpp
+++ b/dep/StormLib/src/SFileFindFile.cpp
@@ -225,8 +225,12 @@ static TFileEntry * FindPatchEntry(TMPQArchive * ha, TFileEntry * pFileEntry)
ha = ha->haPatch;
// Prepare the prefix for the file name
+ char* fileName = pFileEntry->szFileName;
+ if (fileName == NULL)
+ continue;
+
strcpy(szFileName, ha->szPatchPrefix);
- strcat(szFileName, pFileEntry->szFileName);
+ strcat(szFileName, fileName);
// Try to find the file there
pTempEntry = GetFileEntryExact(ha, szFileName, lcLocale);

6
dep/StormLib/src/SFileFindFile.cpp
View File

@@ -225,8 +225,12 @@ static TFileEntry * FindPatchEntry(TMPQArchive * ha, TFileEntry * pFileEntry)
ha = ha->haPatch;
// Prepare the prefix for the file name
char* fileName = pFileEntry->szFileName;
if (fileName == NULL)
continue;
strcpy(szFileName, ha->szPatchPrefix);
strcat(szFileName, pFileEntry->szFileName);
strcat(szFileName, fileName);
// Try to find the file there
pTempEntry = GetFileEntryExact(ha, szFileName, lcLocale);