diff options
| author | Subv <s.v.h21@hotmail.com> | 2013-05-17 21:11:18 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2013-05-17 21:11:18 -0500 |
| commit | 25acef257240edb7763eac043554ca7c7ac767eb (patch) | |
| tree | e574a1a4936201d811a06eb132720eef68d99d99 /src/server/game/Entities | |
| parent | 7c18bbb95f896fa320e4f8a2b7808714b8ba270c (diff) | |
* Batch of fixes for issues found by static analysis.
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 83118e6ded7..b1abf028262 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4149,6 +4149,7 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank) // learnSpell(prev_id, false); } // if ranked non-stackable spell: need activate lesser rank and update dendence state + /// No need to check for spellInfo != NULL here because if cur_active is true, then that means that the spell was already in m_spells, and only valid spells can be pushed there. else if (cur_active && !spellInfo->IsStackableWithRanks() && spellInfo->IsRanked()) { // need manually update dependence state (learn spell ignore like attempts) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3872f9154b9..5fb106b4913 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7478,7 +7478,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp case SPELLFAMILY_PALADIN: { // Infusion of Light - if (dummySpell->SpellIconID == 3021) + if (procSpell && dummySpell->SpellIconID == 3021) { // Flash of Light HoT on Flash of Light when Sacred Shield active if (procSpell->SpellFamilyFlags[0] & 0x40000000 && procSpell->SpellIconID == 242) @@ -7509,6 +7509,8 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp // Glyph of Divinity else if (dummySpell->Id == 54939) { + if (!procSpell) + return false; *handled = true; // Check if we are the target and prevent mana gain if (victim && triggeredByAura->GetCasterGUID() == victim->GetGUID()) @@ -16837,7 +16839,7 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a } } - if (aurApp && aurApp->GetRemoveMode()) + if (!aurApp || aurApp->GetRemoveMode()) return; if (Player* player = ToPlayer()) |