aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2019-09-27 14:12:10 +0200
committerGiacomo Pozzoni <giacomopoz@gmail.com>2019-09-27 14:12:10 +0200
commitca8953a0ec8356345147b2bbc7bbdf0fa97cd625 (patch)
treed6548af64aaa7b49f79b796a9d7f29a675127d6a /src
parent176f51d1e80dc116c5a16bc6aad295016ad8b6cd (diff)
Core/Misc: Fix static analysis issues
Fix static analysis issues reported by Coverity
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Chat/Channels/Channel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index d0e31732006..ef11cc0da30 100644
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -316,7 +316,7 @@ void Channel::KickOrBan(Player const* player, std::string const& badname, bool b
Player* bad = ObjectAccessor::FindConnectedPlayerByName(badname);
ObjectGuid victim = bad ? bad->GetGUID() : ObjectGuid::Empty;
- if (!victim || !IsOn(victim))
+ if (!bad || !victim || !IsOn(victim))
{
PlayerNotFoundAppend appender(badname);
ChannelNameBuilder<PlayerNotFoundAppend> builder(this, appender);
@@ -463,7 +463,7 @@ void Channel::SetMode(Player const* player, std::string const& p2n, bool mod, bo
Player* newp = ObjectAccessor::FindConnectedPlayerByName(p2n);
ObjectGuid victim = newp ? newp->GetGUID() : ObjectGuid::Empty;
- if (!victim || !IsOn(victim) ||
+ if (!newp || !victim || !IsOn(victim) ||
(player->GetTeam() != newp->GetTeam() &&
(!player->GetSession()->HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHANNEL) ||
!newp->GetSession()->HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHANNEL))))
@@ -558,7 +558,7 @@ void Channel::SetOwner(Player const* player, std::string const& newname)
Player* newp = ObjectAccessor::FindConnectedPlayerByName(newname);
ObjectGuid victim = newp ? newp->GetGUID() : ObjectGuid::Empty;
- if (!victim || !IsOn(victim) ||
+ if (!newp || !victim || !IsOn(victim) ||
(player->GetTeam() != newp->GetTeam() &&
(!player->GetSession()->HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHANNEL) ||
!newp->GetSession()->HasPermission(rbac::RBAC_PERM_TWO_SIDE_INTERACTION_CHANNEL))))