phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-17 17:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

game: fix Classic 1.12 SMSG_WHO missing gender byte alignment

Browse source 
Vanilla 1.12 SMSG_WHO per-player format:
  name(CString) + guild(CString) + level(u32) + class(u32) + race(u32) + zone(u32)

WotLK 3.3.5a added a gender(u8) byte between race and zone. The previous
handleWho always read the gender byte, causing a one-byte misalignment for
Classic/TBC: the first byte of zoneId was consumed as gender, then zoneId
read from the next 4 bytes (spanning into the next player entry).

Now only reads the gender byte for WotLK (isActiveExpansion("wotlk")), and
adds bounds checks to prevent out-of-bounds reads on truncated packets.
This commit is contained in:
Kelsi 2026-03-10 01:08:13 -07:00
parent c19edd407a
commit ab0828a4ce
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/game_handler.cpp
View file

@ -16390,7 +16390,10 @@ void GameHandler::handlePlayedTime(network::Packet& packet) {
} }
void GameHandler::handleWho(network::Packet& packet) { void GameHandler::handleWho(network::Packet& packet) {
// Parse WHO response // Classic 1.12 / TBC 2.4.3 per-player: name + guild + level(u32) + class(u32) + race(u32) + zone(u32)
// WotLK 3.3.5a added a gender(u8) field between race and zone.
const bool hasGender = isActiveExpansion("wotlk");
uint32_t displayCount = packet.readUInt32(); uint32_t displayCount = packet.readUInt32();
uint32_t onlineCount = packet.readUInt32(); uint32_t onlineCount = packet.readUInt32();
@ -16404,18 +16407,21 @@ void GameHandler::handleWho(network::Packet& packet) {
addSystemChatMessage(std::to_string(onlineCount) + " player(s) online:"); addSystemChatMessage(std::to_string(onlineCount) + " player(s) online:");
for (uint32_t i = 0; i < displayCount; ++i) { for (uint32_t i = 0; i < displayCount; ++i) {
if (packet.getReadPos() >= packet.getSize()) break;
std::string playerName = packet.readString(); std::string playerName = packet.readString();
std::string guildName = packet.readString(); std::string guildName = packet.readString();
uint32_t level = packet.readUInt32(); if (packet.getSize() - packet.getReadPos() < 12) break;
uint32_t level = packet.readUInt32();
uint32_t classId = packet.readUInt32(); uint32_t classId = packet.readUInt32();
uint32_t raceId = packet.readUInt32(); uint32_t raceId = packet.readUInt32();
packet.readUInt8(); // gender (unused) if (hasGender && packet.getSize() - packet.getReadPos() >= 1)
packet.readUInt32(); // zoneId (unused) packet.readUInt8(); // gender (WotLK only, unused)
if (packet.getSize() - packet.getReadPos() >= 4)
packet.readUInt32(); // zoneId (unused)
std::string msg = " " + playerName; std::string msg = " " + playerName;
if (!guildName.empty()) { if (!guildName.empty())
msg += " <" + guildName + ">"; msg += " <" + guildName + ">";
}
msg += " - Level " + std::to_string(level); msg += " - Level " + std::to_string(level);
addSystemChatMessage(msg); addSystemChatMessage(msg);