jann/m2dev-client-src
1
0
Fork 0
forked from metin-server/m2dev-client-src
Code Pull Requests Activity

x64 crashes fixed

Browse Source
This commit is contained in:
d1str4ught
2025-08-19 03:54:44 +02:00
parent e87b6fc67b
commit 61a04096ee
10 changed files with 114 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/EterBase/lzo.cpp
View File

@@ -259,48 +259,54 @@ private:
bool CLZObject::Decompress(DWORD * pdwKey)
{
UINT uiSize;
int r;
if (m_pHeader->dwEncryptSize)
{
DecryptBuffer buf(m_pHeader->dwEncryptSize);
int r;
lzo_uint out_len = static_cast<lzo_uint>(m_dwBufferSize); // capacity of m_pbBuffer
if (m_pHeader->dwEncryptSize)
{
DecryptBuffer buf(m_pHeader->dwEncryptSize);
BYTE* pbDecryptedBuffer = static_cast<BYTE*>(buf.GetBufferPtr());
BYTE* pbDecryptedBuffer = (BYTE*)buf.GetBufferPtr();
__Decrypt(pdwKey, pbDecryptedBuffer);
if (*(DWORD *) pbDecryptedBuffer != ms_dwFourCC)
if (*reinterpret_cast<DWORD*>(pbDecryptedBuffer) != ms_dwFourCC)
{
TraceError("LZObject: key incorrect");
return false;
}
if (LZO_E_OK != (r = lzo1x_decompress(pbDecryptedBuffer + sizeof(DWORD), m_pHeader->dwCompressedSize, m_pbBuffer, (lzo_uint*) &uiSize, NULL)))
{
TraceError("LZObject: Decompress failed(decrypt) ret %d\n", r);
return false;
}
}
else
{
uiSize = m_pHeader->dwRealSize;
//if (LZO_E_OK != (r = lzo1x_decompress_safe(m_pbIn, m_pHeader->dwCompressedSize, m_pbBuffer, (lzo_uint*) &uiSize, NULL)))
if (LZO_E_OK != (r = lzo1x_decompress(m_pbIn, m_pHeader->dwCompressedSize, m_pbBuffer, (lzo_uint*) &uiSize, NULL)))
{
TraceError("LZObject: Decompress failed : ret %d, CompressedSize %d\n", r, m_pHeader->dwCompressedSize);
return false;
}
}
if (uiSize != m_pHeader->dwRealSize)
{
r = lzo1x_decompress_safe(
pbDecryptedBuffer + sizeof(DWORD),
static_cast<lzo_uint>(m_pHeader->dwCompressedSize),
m_pbBuffer,
&out_len,
nullptr);
}
else
{
out_len = static_cast<lzo_uint>(m_dwBufferSize); // reset capacity
r = lzo1x_decompress_safe(
m_pbIn,
static_cast<lzo_uint>(m_pHeader->dwCompressedSize),
m_pbBuffer,
&out_len,
nullptr);
}
if (r != LZO_E_OK)
{
TraceError("LZObject: Decompress failed: ret %d, CompressedSize %u",
r, m_pHeader->dwCompressedSize);
return false;
}
if (out_len != static_cast<lzo_uint>(m_pHeader->dwRealSize))
{
TraceError("LZObject: Size differs");
return false;
}
return true;
}
return true;
}
bool CLZObject::Encrypt(DWORD * pdwKey)