Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Fixed handling CMSG_UPDATE_ACCOUNT_DATA - compressed value is not a null-terminated string

Browse Source 
(cherry picked from commit a4ecb2dfae)
This commit is contained in:
Shauren
2024-08-05 14:13:17 +02:00
committed by Ovahlord
parent 2624503e7e
commit 33cfe6b2eb
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Handlers/MiscHandler.cpp
View File

@@ -706,19 +706,17 @@ void WorldSession::HandleUpdateAccountData(WorldPackets::ClientConfig::UserClien
return;
}
ByteBuffer dest(packet.Size, ByteBuffer::Resize{});
std::string dest;
dest.resize(packet.Size);
uLongf realSize = packet.Size;
if (uncompress(dest.contents(), &realSize, packet.CompressedData.contents(), packet.CompressedData.size()) != Z_OK)
if (uncompress(reinterpret_cast<Bytef*>(dest.data()), &realSize, packet.CompressedData.contents(), packet.CompressedData.size()) != Z_OK)
{
TC_LOG_ERROR("network", "UAD: Failed to decompress account data");
return;
}
std::string adata;
dest >> adata;
SetAccountData(AccountDataType(packet.DataType), packet.Time, adata);
SetAccountData(AccountDataType(packet.DataType), packet.Time, dest);
}
void WorldSession::HandleRequestAccountData(WorldPackets::ClientConfig::RequestAccountData& request)

7
src/server/shared/Packets/ByteBuffer.h
View File

@@ -633,16 +633,13 @@ class TC_SHARED_API ByteBuffer
/// @todo Make a ByteBuffer.cpp and move all this inlining to it.
template<> inline std::string ByteBuffer::read<std::string>()
{
std::string tmp;
*this >> tmp;
return tmp;
return std::string(ReadCString());
}
template<>
inline void ByteBuffer::read_skip<char*>()
{
std::string temp;
*this >> temp;
(void)ReadCString();
}
template<>