aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2017-12-08 15:14:51 +0100
committerShauren <shauren.trinity@gmail.com>2020-08-21 23:13:13 +0200
commitbf5be2839652e038eeb87c9fa301fd9dd6de8982 (patch)
treef8c2509e4da47757e2a125fa5c611eda2a483dfe
parent42c65c3bc22f97a96d9db481997d74e7103f8e64 (diff)
Core/Misc: Fix static analysis issues
Fix various coverity reported issues (cherry picked from commit 925557d1c097cd45311b38dc3a9c715579456980)
-rw-r--r--src/server/game/Entities/Player/Player.cpp1
-rw-r--r--src/server/game/Maps/Map.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index c0dc3695161..c4134b4f3b5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -16476,6 +16476,7 @@ void Player::RemoveRewardedQuest(uint32 questId, bool update /*= true*/)
// Remove seasonal quest also
Quest const* qInfo = sObjectMgr->GetQuestTemplate(questId);
+ ASSERT(qInfo);
if (qInfo->IsSeasonal())
{
uint16 eventId = qInfo->GetEventIdForQuest();
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 5bee032d2c2..8b2e2cab53e 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2943,8 +2943,10 @@ void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x,
if (vmapData.areaInfo)
data.areaInfo = boost::in_place(vmapData.areaInfo->adtId, vmapData.areaInfo->rootId, vmapData.areaInfo->groupId, vmapData.areaInfo->mogpFlags);
+ float mapHeight = VMAP_INVALID_HEIGHT;
GridMap* gmap = GetGrid(terrainMapId, x, y);
- float mapHeight = gmap->getHeight(x, y);
+ if (gmap)
+ mapHeight = gmap->getHeight(x, y);
// area lookup
AreaTableEntry const* areaEntry = nullptr;