diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-01-30 22:32:26 +0100 |
|---|---|---|
| committer | Nayd <dnpd.dd@gmail.com> | 2015-02-02 01:45:38 +0000 |
| commit | 7b05b0cb81dd933049aa8af49a060edf915ca94c (patch) | |
| tree | d80f5ca90ce227fde945e48382cc41f48db0e7f9 | |
| parent | 13cbed36ef5f873d97ba8cccd19ef8cffb2ab9e3 (diff) | |
Core/Misc: Fix static analysis issues
Fix some static analysis issues reported by Coverity
(cherry picked from commit 89c535cf2a960ccc03cd1a032310984f9b4e1d47)
Conflicts:
src/server/game/Entities/Player/Player.cpp
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Debugging/Errors.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f6954385dfb..63580b355a4 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -19086,7 +19086,7 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report else if (mapDiff->hasErrorMessage) // if (missingAchievement) covered by this case SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty); else if (missingItem) - GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, sObjectMgr->GetItemTemplate(missingItem)->Name1.c_str()); + GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, ASSERT_NOTNULL(sObjectMgr->GetItemTemplate(missingItem))->Name1.c_str()); else if (LevelMin) GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED), LevelMin); } diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h index df770c2aa47..4d4624b63dd 100644 --- a/src/server/shared/Debugging/Errors.h +++ b/src/server/shared/Debugging/Errors.h @@ -49,4 +49,10 @@ namespace Trinity #define ASSERT WPAssert +template <typename T> inline T* ASSERT_NOTNULL(T* pointer) +{ + ASSERT(pointer); + return pointer; +} + #endif |