diff options
author | jackpoz <giacomopoz@gmail.com> | 2015-02-01 15:38:07 +0100 |
---|---|---|
committer | Nayd <dnpd.dd@gmail.com> | 2015-02-02 01:47:59 +0000 |
commit | 2ec6844666c899704f3bb13768a4872139095ae5 (patch) | |
tree | cc0d3d907fec153a6d10a4d1c8e9151b57c2373b /src | |
parent | 7b05b0cb81dd933049aa8af49a060edf915ca94c (diff) |
Core/Misc: Fix static analysis issues
Fix some static analysis issues reported by Coverity
(cherry picked from commit c8999449816d4fd4f72c7cdb3b1515e8e244ba5f)
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Groups/Group.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index d9124551c63..5664cbb6e4b 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1808,7 +1808,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const* return ERR_BATTLEGROUND_NONE; // ERR_GROUP_JOIN_BATTLEGROUND_TOO_MANY handled on client side // get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.) - Player* reference = GetFirstMember()->GetSource(); + Player* reference = ASSERT_NOTNULL(GetFirstMember())->GetSource(); // no reference found, can't join this way if (!reference) return ERR_BATTLEGROUND_JOIN_FAILED; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 4c6fd0f2fcc..63082808e03 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1259,7 +1259,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader return; uint32 triggerSpell = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell; - SpellInfo const* spell = sSpellMgr->GetSpellInfo(triggerSpell); + SpellInfo const* spell = sSpellMgr->EnsureSpellInfo(triggerSpell); spell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, caster); int32 damage = spell->Effects[EFFECT_0].CalcValue(caster); |