diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 696563474..624169fe8 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -1519,7 +1519,10 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode( WorldPacket & recv_data ) sLog.outDebug("WORLD: CMSG_MOVE_SET_CAN_FLY_ACK"); //recv_data.hexlike(); - recv_data.read_skip(); // guid + uint64 guid; // guid - unused + if(!recv_data.readPackGUID(guid)) + return; + recv_data.read_skip(); // unk MovementInfo movementInfo; diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 3d10973c6..b1e578893 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -526,8 +526,10 @@ void WorldSession::HandleMoveKnockBackAck( WorldPacket & recv_data ) { sLog.outDebug("CMSG_MOVE_KNOCK_BACK_ACK"); - uint64 guid; - recv_data.readPackGUID(guid); + uint64 guid; // guid - unused + if(!recv_data.readPackGUID(guid)) + return; + recv_data.read_skip(); // unk MovementInfo movementInfo; @@ -538,8 +540,10 @@ void WorldSession::HandleMoveHoverAck( WorldPacket& recv_data ) { sLog.outDebug("CMSG_MOVE_HOVER_ACK"); - uint64 guid; - recv_data.readPackGUID(guid); + uint64 guid; // guid - unused + if(!recv_data.readPackGUID(guid)) + return; + recv_data.read_skip(); // unk MovementInfo movementInfo; @@ -552,8 +556,10 @@ void WorldSession::HandleMoveWaterWalkAck(WorldPacket& recv_data) { sLog.outDebug("CMSG_MOVE_WATER_WALK_ACK"); - uint64 guid; - recv_data.readPackGUID(guid); + uint64 guid; // guid - unused + if(!recv_data.readPackGUID(guid)) + return; + recv_data.read_skip(); // unk MovementInfo movementInfo; diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 2372dfd4b..85d600e7b 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -345,8 +345,10 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) if(unk1) { recvPacket.read_skip(); // >> MSG_MOVE_STOP - uint64 guid; - recvPacket.readPackGUID(guid); + uint64 guid; // guid - unused + if(!recvPacket.readPackGUID(guid)) + return; + MovementInfo movementInfo; ReadMovementInfo(recvPacket, &movementInfo); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 94f860d26..00c978acb 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8600" + #define REVISION_NR "8601" #endif // __REVISION_NR_H__