Merge pull request #378 from pionere/hashpow

validate dwHashTableSize

1 files changed, 5 insertions, 0 deletions

diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp
index 0461be2..843f81e 100644
--- a/src/SBaseFileTable.cpp
+++ b/src/SBaseFileTable.cpp
@@ -2560,7 +2560,12 @@ DWORD LoadAnyHashTable(TMPQArchive * ha)
     // Note that we load the classic hash table even when HET table exists,

     // because if the MPQ gets modified and saved, hash table must be there

     if(pHeader->dwHashTableSize)

+    {

+        // hash-table size must be a power or 2

+        if ((pHeader->dwHashTableSize & (pHeader->dwHashTableSize - 1)) != 0)

+            return ERROR_FILE_CORRUPT;

         ha->pHashTable = LoadHashTable(ha);

+    }

 

     // At least one of the tables must be present

     if(ha->pHetTable == NULL && ha->pHashTable == NULL)