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

refactor: replace 13 remaining getReadPos()+N bounds checks in game_handler

Browse source 
Convert final getReadPos()+N>getSize() patterns to hasRemaining(N),
completing the migration across all 5 packet-handling files.
This commit is contained in:
Kelsi 2026-03-25 16:17:36 -07:00
parent e9d0a58e0a
commit ca08d4313a
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/game/game_handler.cpp
View file

@ -3179,7 +3179,7 @@ void GameHandler::registerOpcodeHandlers() {
} }
dispatchTable_[Opcode::SMSG_TRANSFER_PENDING] = [this](network::Packet& packet) { dispatchTable_[Opcode::SMSG_TRANSFER_PENDING] = [this](network::Packet& packet) {
uint32_t pendingMapId = packet.readUInt32(); uint32_t pendingMapId = packet.readUInt32();
if (packet.getReadPos() + 8 <= packet.getSize()) { if (packet.hasRemaining(8)) {
packet.readUInt32(); // transportEntry packet.readUInt32(); // transportEntry
packet.readUInt32(); // transportMapId packet.readUInt32(); // transportMapId
} }
@ -17667,7 +17667,7 @@ void GameHandler::handleMonsterMoveTransport(network::Packet& packet) {
if (!entity) return; if (!entity) return;
// ---- Spline data (same format as SMSG_MONSTER_MOVE, transport-local coords) ---- // ---- Spline data (same format as SMSG_MONSTER_MOVE, transport-local coords) ----
if (packet.getReadPos() + 5 > packet.getSize()) { if (!packet.hasRemaining(5)) {
// No spline data — snap to start position // No spline data — snap to start position
if (transportManager_) { if (transportManager_) {
glm::vec3 localCanonical = core::coords::serverToCanonical(glm::vec3(localX, localY, localZ)); glm::vec3 localCanonical = core::coords::serverToCanonical(glm::vec3(localX, localY, localZ));
@ -17699,12 +17699,12 @@ void GameHandler::handleMonsterMoveTransport(network::Packet& packet) {
// Facing data based on moveType // Facing data based on moveType
float facingAngle = entity->getOrientation(); float facingAngle = entity->getOrientation();
if (moveType == 2) { // FacingSpot if (moveType == 2) { // FacingSpot
if (packet.getReadPos() + 12 > packet.getSize()) return; if (!packet.hasRemaining(12)) return;
float sx = packet.readFloat(), sy = packet.readFloat(), sz = packet.readFloat(); float sx = packet.readFloat(), sy = packet.readFloat(), sz = packet.readFloat();
facingAngle = std::atan2(-(sy - localY), sx - localX); facingAngle = std::atan2(-(sy - localY), sx - localX);
(void)sz; (void)sz;
} else if (moveType == 3) { // FacingTarget } else if (moveType == 3) { // FacingTarget
if (packet.getReadPos() + 8 > packet.getSize()) return; if (!packet.hasRemaining(8)) return;
uint64_t tgtGuid = packet.readUInt64(); uint64_t tgtGuid = packet.readUInt64();
if (auto tgt = entityManager.getEntity(tgtGuid)) { if (auto tgt = entityManager.getEntity(tgtGuid)) {
float dx = tgt->getX() - entity->getX(); float dx = tgt->getX() - entity->getX();
@ -17713,27 +17713,27 @@ void GameHandler::handleMonsterMoveTransport(network::Packet& packet) {
facingAngle = std::atan2(-dy, dx); facingAngle = std::atan2(-dy, dx);
} }
} else if (moveType == 4) { // FacingAngle } else if (moveType == 4) { // FacingAngle
if (packet.getReadPos() + 4 > packet.getSize()) return; if (!packet.hasRemaining(4)) return;
facingAngle = core::coords::serverToCanonicalYaw(packet.readFloat()); facingAngle = core::coords::serverToCanonicalYaw(packet.readFloat());
} }
if (packet.getReadPos() + 4 > packet.getSize()) return; if (!packet.hasRemaining(4)) return;
uint32_t splineFlags = packet.readUInt32(); uint32_t splineFlags = packet.readUInt32();
if (splineFlags & 0x00400000) { // Animation if (splineFlags & 0x00400000) { // Animation
if (packet.getReadPos() + 5 > packet.getSize()) return; if (!packet.hasRemaining(5)) return;
packet.readUInt8(); packet.readUInt32(); packet.readUInt8(); packet.readUInt32();
} }
if (packet.getReadPos() + 4 > packet.getSize()) return; if (!packet.hasRemaining(4)) return;
uint32_t duration = packet.readUInt32(); uint32_t duration = packet.readUInt32();
if (splineFlags & 0x00000800) { // Parabolic if (splineFlags & 0x00000800) { // Parabolic
if (packet.getReadPos() + 8 > packet.getSize()) return; if (!packet.hasRemaining(8)) return;
packet.readFloat(); packet.readUInt32(); packet.readFloat(); packet.readUInt32();
} }
if (packet.getReadPos() + 4 > packet.getSize()) return; if (!packet.hasRemaining(4)) return;
uint32_t pointCount = packet.readUInt32(); uint32_t pointCount = packet.readUInt32();
constexpr uint32_t kMaxTransportSplinePoints = 1000; constexpr uint32_t kMaxTransportSplinePoints = 1000;
if (pointCount > kMaxTransportSplinePoints) { if (pointCount > kMaxTransportSplinePoints) {
@ -17749,17 +17749,17 @@ void GameHandler::handleMonsterMoveTransport(network::Packet& packet) {
const bool uncompressed = (splineFlags & (0x00080000 | 0x00002000)) != 0; const bool uncompressed = (splineFlags & (0x00080000 | 0x00002000)) != 0;
if (uncompressed) { if (uncompressed) {
for (uint32_t i = 0; i < pointCount - 1; ++i) { for (uint32_t i = 0; i < pointCount - 1; ++i) {
if (packet.getReadPos() + 12 > packet.getSize()) break; if (!packet.hasRemaining(12)) break;
packet.readFloat(); packet.readFloat(); packet.readFloat(); packet.readFloat(); packet.readFloat(); packet.readFloat();
} }
if (packet.getReadPos() + 12 <= packet.getSize()) { if (packet.hasRemaining(12)) {
destLocalX = packet.readFloat(); destLocalX = packet.readFloat();
destLocalY = packet.readFloat(); destLocalY = packet.readFloat();
destLocalZ = packet.readFloat(); destLocalZ = packet.readFloat();
hasDest = true; hasDest = true;
} }
} else { } else {
if (packet.getReadPos() + 12 <= packet.getSize()) { if (packet.hasRemaining(12)) {
destLocalX = packet.readFloat(); destLocalX = packet.readFloat();
destLocalY = packet.readFloat(); destLocalY = packet.readFloat();
destLocalZ = packet.readFloat(); destLocalZ = packet.readFloat();