aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2021-06-20 13:11:53 +0200
committerShauren <shauren.trinity@gmail.com>2022-03-11 11:48:18 +0100
commitd0fe16b78743bace4e620089787dfd3919a31a68 (patch)
treefbdf93418f3eaac9b642f4ec4ef5e751a0097975 /src
parent7d01ad8b8f7d20769058c642e690847aa51196c6 (diff)
Core/Misc: Fix issues reported by static analysis
(cherry picked from commit 33dace231c5a169375523ffa89a2cc3fa48737bd)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp2
-rw-r--r--src/server/game/Groups/Group.cpp1
-rw-r--r--src/server/game/Groups/GroupMgr.cpp1
-rw-r--r--src/server/game/Pools/PoolMgr.cpp1
-rw-r--r--src/server/game/Spells/SpellEffects.cpp1
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp8
-rw-r--r--src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp4
-rw-r--r--src/server/scripts/World/achievement_scripts.cpp2
9 files changed, 11 insertions, 11 deletions
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;
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index bfd84278a14..97ec8648d2e 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -206,9 +206,7 @@ public:
sObjectMgr->AddVendorItem(vendor_entry, vItem);
- ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId);
-
- handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST, itemId, itemTemplate->GetDefaultLocaleName(), maxcount, incrtime, extendedcost);
+ handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST, itemId, item->GetDefaultLocaleName(), maxcount, incrtime, extendedcost);
return true;
}
@@ -360,9 +358,7 @@ public:
return false;
}
- ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId);
-
- handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST, itemId, itemTemplate->GetDefaultLocaleName());
+ handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST, itemId, item->GetDefaultLocaleName());
return true;
}
diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
index 7a9a7ce3594..c3263533db1 100644
--- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
+++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
@@ -204,7 +204,7 @@ class spell_ioc_launch : public SpellScript
if (!GetCaster()->ToCreature() || !GetExplTargetDest())
return;
- GetCaster()->ToCreature()->m_Events.AddEvent(new StartLaunchEvent(*GetExplTargetDest(), GetHitPlayer()->GetGUID()), GetCaster()->ToCreature()->m_Events.CalculateTime(2500ms));
+ GetCaster()->ToCreature()->m_Events.AddEvent(new StartLaunchEvent(*GetExplTargetDest(), ASSERT_NOTNULL(GetHitPlayer())->GetGUID()), GetCaster()->ToCreature()->m_Events.CalculateTime(2500ms));
}
void Register() override
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
index 5c39a3c9e04..f245bd6e873 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp
@@ -113,7 +113,7 @@ private:
struct npc_underbog_mushroom : public ScriptedAI
{
- npc_underbog_mushroom(Creature* creature) : ScriptedAI(creature) { }
+ npc_underbog_mushroom(Creature* creature) : ScriptedAI(creature), _counter(0) { }
void InitializeAI() override
{
@@ -154,7 +154,7 @@ struct npc_underbog_mushroom : public ScriptedAI
private:
TaskScheduler _scheduler;
- uint32 _counter = 0;
+ uint32 _counter;
};
void AddSC_boss_hungarfen()
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 30364ac5fe6..46e221e5753 100644
--- a/src/server/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
@@ -144,7 +144,7 @@ class achievement_arena_kills : public AchievementCriteriaScript
if (!source->InArena())
return false;
- return source->GetBattleground()->GetArenaType() == _arenaType;
+ return ASSERT_NOTNULL(source->GetBattleground())->GetArenaType() == _arenaType;
}
private: