From d0fe16b78743bace4e620089787dfd3919a31a68 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 20 Jun 2021 13:11:53 +0200 Subject: Core/Misc: Fix issues reported by static analysis (cherry picked from commit 33dace231c5a169375523ffa89a2cc3fa48737bd) --- src/server/game/Entities/Creature/Creature.cpp | 2 +- src/server/game/Groups/Group.cpp | 1 + src/server/game/Groups/GroupMgr.cpp | 1 + src/server/game/Pools/PoolMgr.cpp | 1 + src/server/game/Spells/SpellEffects.cpp | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/server/game') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 90e239e9a5b..5a02af396fc 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3018,7 +3018,7 @@ uint32 Creature::GetScriptId() const if (uint32 scriptId = creatureData->scriptId) return scriptId; - return sObjectMgr->GetCreatureTemplate(GetEntry())->ScriptID; + return ASSERT_NOTNULL(sObjectMgr->GetCreatureTemplate(GetEntry()))->ScriptID; } VendorItemData const* Creature::GetVendorItems() const diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index dad64b94c1f..3b17bb29d32 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1050,6 +1050,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* lootedObject) continue; item = ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(i->itemid)); + ASSERT(item); //roll for over-threshold item if it's one-player loot if (item->GetQuality() >= uint32(m_lootThreshold)) diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp index 8d58eb07a86..d6cc28052e0 100644 --- a/src/server/game/Groups/GroupMgr.cpp +++ b/src/server/game/Groups/GroupMgr.cpp @@ -228,6 +228,7 @@ void GroupMgr::LoadGroups() Field* fields = result->Fetch(); Group* group = GetGroupByDbStoreId(fields[0].GetUInt32()); // group will never be NULL (we have run consistency sql's before loading) + ASSERT(group); MapEntry const* mapEntry = sMapStore.LookupEntry(fields[1].GetUInt16()); if (!mapEntry || !mapEntry->IsDungeon()) diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index b0f9cb21a8e..d86421812b3 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -568,6 +568,7 @@ void PoolMgr::LoadFromDB() } GameObjectTemplate const* goinfo = sObjectMgr->GetGameObjectTemplate(data->id); + ASSERT(goinfo); if (goinfo->type != GAMEOBJECT_TYPE_CHEST && goinfo->type != GAMEOBJECT_TYPE_FISHINGHOLE && goinfo->type != GAMEOBJECT_TYPE_GATHERING_NODE && diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index c835658188c..44a08afa328 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -802,6 +802,7 @@ void Spell::EffectTriggerRitualOfSummoning() void Spell::CalculateJumpSpeeds(SpellEffectInfo const* effInfo, float dist, float& speedXY, float& speedZ) { Unit* unitCaster = GetUnitCasterForEffectHandlers(); + ASSERT(unitCaster); float runSpeed = unitCaster->IsControlledByPlayer() ? playerBaseMoveSpeed[MOVE_RUN] : baseMoveSpeed[MOVE_RUN]; if (Creature* creature = unitCaster->ToCreature()) runSpeed *= creature->GetCreatureTemplate()->speed_run; -- cgit v1.2.3