diff options
| author | Ladislav Zezula <zezula@volny.cz> | 2025-02-26 20:54:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-26 20:54:25 +0100 |
| commit | 02616bbabc1412c53ecc4c68694b31f62b532c1d (patch) | |
| tree | 8fa3a82f2cb2d3cb358454096fcca640c20f18dd /src/SFileOpenArchive.cpp | |
| parent | e01d93cc8ae743cfe2da5450854c5d2e3a939265 (diff) | |
| parent | 8e1f843c940f72e07acb33933e50c974509f774d (diff) | |
Merge pull request #376 from pionere/arch_zero
Merged. Thanks for the contribution 👍
Diffstat (limited to 'src/SFileOpenArchive.cpp')
| -rw-r--r-- | src/SFileOpenArchive.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/SFileOpenArchive.cpp b/src/SFileOpenArchive.cpp index 587aa96..217feca 100644 --- a/src/SFileOpenArchive.cpp +++ b/src/SFileOpenArchive.cpp @@ -268,7 +268,9 @@ bool WINAPI SFileOpenArchive( // Allocate the MPQhandle if(dwErrCode == ERROR_SUCCESS) { - if((ha = STORM_ALLOC(TMPQArchive, 1)) == NULL) + if((ha = STORM_ALLOC(TMPQArchive, 1)) != NULL) + memset(ha, 0, sizeof(TMPQArchive)); + else dwErrCode = ERROR_NOT_ENOUGH_MEMORY; } @@ -290,7 +292,6 @@ bool WINAPI SFileOpenArchive( DWORD dwHeaderID; bool bSearchComplete = false; - memset(ha, 0, sizeof(TMPQArchive)); ha->dwValidFileFlags = MPQ_FILE_VALID_FLAGS; ha->pfnHashString = HashStringSlash; ha->pStream = pStream; |