aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-03-31 20:59:33 +0200
committerjackpoz <giacomopoz@gmail.com>2014-03-31 20:59:33 +0200
commitf47962f6707bb53a3241d23257a5bbd1b2679f87 (patch)
tree96a7350fcb3254c9b9830612a7f3156a4c9cecaa /src/server/game
parentbacfbdc4ee2be1206ff06e5aa0c3c53991dff959 (diff)
Core/Misc: Fix some static analysis issues
Add some asserts and additional NULL checks as sanity checks.
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Entities/Object/Object.cpp1
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 12c8d0ba2ac..69f7073ce1b 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -350,6 +350,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
// 0x20
if (flags & UPDATEFLAG_LIVING)
{
+ ASSERT(unit);
unit->BuildMovementPacket(data);
*data << unit->GetSpeed(MOVE_WALK)
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 4ed742167a5..06bd12911ad 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -1824,6 +1824,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo
if (target->GetTypeId() == TYPEID_PLAYER)
{
SpellShapeshiftEntry const* shapeInfo = sSpellShapeshiftStore.LookupEntry(form);
+ ASSERT(shapeInfo);
// Learn spells for shapeshift form - no need to send action bars or add spells to spellbook
for (uint8 i = 0; i<MAX_SHAPESHIFT_SPELLS; ++i)
{