Merge pull request #346 from ladislav-zezula/LZ_GabeShermanFoundBugs

Fixed bugs found by Gabe Sherman

1 files changed, 4 insertions, 0 deletions

diff --git a/src/SFileGetFileInfo.cpp b/src/SFileGetFileInfo.cpp
index 20f5e75..1746fa0 100644
--- a/src/SFileGetFileInfo.cpp
+++ b/src/SFileGetFileInfo.cpp
@@ -428,6 +428,8 @@ bool WINAPI SFileGetFileInfo(
             return GetInfo(pvFileInfo, cbFileInfo, &dwInt32Value, sizeof(DWORD), pcbLengthNeeded);

 

         case SFileInfoFileIndex:

+            if(hf->ha == NULL)

+                return GetInfo_ReturnError(ERROR_INVALID_PARAMETER);

             dwInt32Value = (DWORD)(pFileEntry - hf->ha->pFileTable);

             return GetInfo(pvFileInfo, cbFileInfo, &dwInt32Value, sizeof(DWORD), pcbLengthNeeded);

 

@@ -450,6 +452,8 @@ bool WINAPI SFileGetFileInfo(
             return GetInfo(pvFileInfo, cbFileInfo, &hf->dwFileKey, sizeof(DWORD), pcbLengthNeeded);

 

         case SFileInfoEncryptionKeyRaw:

+            if(pFileEntry == NULL)

+                return GetInfo_ReturnError(ERROR_INVALID_PARAMETER);

             dwInt32Value = hf->dwFileKey;

             if(pFileEntry->dwFlags & MPQ_FILE_KEY_V2)

                 dwInt32Value = (dwInt32Value ^ pFileEntry->dwFileSize) - (DWORD)hf->MpqFilePos;