Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-01-17 21:48:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in the LZMA compression

Browse Source
This commit is contained in:
Ladislav Zezula
2023-02-06 18:30:15 +01:00
parent 9beaed54cd
commit 0d31856af8
5 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/SFileAddFile.cpp
View File

@@ -896,6 +896,7 @@ bool WINAPI SFileAddFileEx(
ULONGLONG FileSize = 0;
ULONGLONG FileTime = 0;
TFileStream * pStream = NULL;
TMPQArchive * ha;
HANDLE hMpqFile = NULL;
LPBYTE pbFileData = NULL;
DWORD dwBytesRemaining = 0;
@@ -907,7 +908,7 @@ bool WINAPI SFileAddFileEx(
DWORD dwErrCode = ERROR_SUCCESS;
// Check parameters
if(hMpq == NULL || szFileName == NULL || *szFileName == 0)
if(hMpq == NULL || szFileName == NULL || *szFileName == 0 || (ha = IsValidMpqHandle(hMpq)) == NULL)
{
SetLastError(ERROR_INVALID_PARAMETER);
return false;
@@ -933,6 +934,13 @@ bool WINAPI SFileAddFileEx(
dwErrCode = ERROR_NOT_ENOUGH_MEMORY;
}
// LZMA compression can only be present in MPQ version 2 or higher
if(dwErrCode == ERROR_SUCCESS)
{
if(dwCompression == MPQ_COMPRESSION_LZMA && ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1)
dwErrCode = ERROR_INVALID_PARAMETER;
}
// Deal with various combination of compressions
if(dwErrCode == ERROR_SUCCESS)
{