From 841630fcc3d02c5bfa66d748eedd8502519ca71e Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 28 Jun 2019 22:18:30 +0200 Subject: Core/Misc: Fix static analysis issues reported by Coverity Scan (cherry picked from commit de88691e257af0bf078d9be74ab3bb578f016547) --- .../CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp | 2 +- .../scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp | 2 +- src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 7cda95b5661..171d9c885f1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1140,7 +1140,7 @@ struct npc_sergeant_morigan : public CreatureScript struct npc_sergeant_moriganAI : public NullCreatureAI { - npc_sergeant_moriganAI(Creature* creature) : NullCreatureAI(creature), Started(false) { } + npc_sergeant_moriganAI(Creature* creature) : NullCreatureAI(creature), Started(false), Question(0) { } void InitializeAI() override { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index 77ddd9b8ec4..19a75c6fc99 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1640,7 +1640,7 @@ struct npc_stratholme_rp_dummy : NullCreatureAI { if (type == POINT_MOTION_TYPE || type == EFFECT_MOTION_TYPE || type == SPLINE_CHAIN_MOTION_TYPE) if (TempSummon* self = me->ToTempSummon()) - self->GetSummonerCreatureBase()->AI()->MovementInform(type, id); + ASSERT_NOTNULL(self->GetSummonerCreatureBase())->AI()->MovementInform(type, id); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index eff9c455cd0..4d9c3279761 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -769,7 +769,7 @@ class boss_thorim : public CreatureScript for (auto itr = triggers.cbegin(); itr != triggers.cend();) { auto prev = itr++; - if (itr != triggers.end()) + if (itr != triggers.cend()) (*prev)->CastSpell(*itr, SPELL_LIGHTNING_BEAM_CHANNEL); } break; -- cgit v1.2.3