aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr00ty-tc <r00ty-tc@users.noreply.github.com>2016-05-14 17:08:45 +0100
committerr00ty-tc <r00ty-tc@users.noreply.github.com>2016-05-14 18:16:06 +0200
commit7a3584298a80924b22deb58aed62d73868468df5 (patch)
tree1b4e04dd8b9a7400b1caedfc322669fe12278351
parenta012b37d66cdfcd3a8f6485c8563740f6f174823 (diff)
Coverity: Correct two static analysis catches
#1355242 - Uninitialized scalar field #1355240 Resource leak in object
-rw-r--r--src/server/game/Entities/Player/CinematicMgr.cpp3
-rw-r--r--src/server/game/Entities/Player/Player.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/CinematicMgr.cpp b/src/server/game/Entities/Player/CinematicMgr.cpp
index 07bf733c9ff..cc5a62300ad 100644
--- a/src/server/game/Entities/Player/CinematicMgr.cpp
+++ b/src/server/game/Entities/Player/CinematicMgr.cpp
@@ -27,6 +27,7 @@ CinematicMgr::CinematicMgr(Player* playerref)
m_cinematicDiff = 0;
m_lastCinematicCheck = 0;
m_activeCinematicCameraId = 0;
+ m_cinematicLength = 0;
m_cinematicCamera = nullptr;
m_remoteSightPosition = Position(0.0f, 0.0f, 0.0f);
m_CinematicObject = nullptr;
@@ -70,6 +71,8 @@ void CinematicMgr::BeginCinematic()
FlyByCameraCollection::const_reverse_iterator camrevitr = m_cinematicCamera->rbegin();
if (camrevitr != m_cinematicCamera->rend())
m_cinematicLength = camrevitr->timeStamp;
+ else
+ m_cinematicLength = 0;
}
}
}
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 9ed101bf52e..50e27d9afa9 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -567,6 +567,7 @@ Player::~Player()
delete m_runes;
delete m_achievementMgr;
delete m_reputationMgr;
+ delete _cinematicMgr;
sWorld->DecreasePlayerCount();
}