diff options
| author | Ladislav Zezula <zezula@volny.cz> | 2025-02-28 10:43:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-28 10:43:09 +0100 |
| commit | 17afc22d0afb33a797d34edcc780f8efd66336bd (patch) | |
| tree | 97e6bb907af657ad5e2efa73c6d85586fbc5695b /src | |
| parent | 626c49312d80312f421a68e42ad052ba880c58e9 (diff) | |
| parent | 786f74bd302a6e99360d9fff1979db95f2f1c741 (diff) | |
Merge pull request #377 from pionere/sofree
Merged. Thanks for the bugfix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/SBaseCommon.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/SBaseCommon.cpp b/src/SBaseCommon.cpp index 7f2aa8c..ecbfc05 100644 --- a/src/SBaseCommon.cpp +++ b/src/SBaseCommon.cpp @@ -1268,8 +1268,11 @@ DWORD AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile) // Append the length of the patch info, if any
if(hf->pPatchInfo != NULL)
{
- if((RawFilePos + hf->pPatchInfo->dwLength) < RawFilePos)
+ if((RawFilePos + hf->pPatchInfo->dwLength) < RawFilePos) {
+ STORM_FREE(hf->SectorOffsets);
+ hf->SectorOffsets = NULL;
return ERROR_FILE_CORRUPT;
+ }
RawFilePos += hf->pPatchInfo->dwLength;
}
@@ -1355,8 +1358,11 @@ DWORD AllocateSectorOffsets(TMPQFile * hf, bool bLoadFromFile) if((hf->SectorOffsets[0] & 0xFFFFFFFC) > dwSectorOffsLen)
{
// MPQ protectors put some ridiculous values there. We must limit the extra bytes
- if(hf->SectorOffsets[0] > (dwSectorOffsLen + 0x400))
+ if(hf->SectorOffsets[0] > (dwSectorOffsLen + 0x400)) {
+ STORM_FREE(hf->SectorOffsets);
+ hf->SectorOffsets = NULL;
return ERROR_FILE_CORRUPT;
+ }
// Free the old sector offset table
dwSectorOffsLen = hf->SectorOffsets[0];
|