diff options
author | jackpoz <giacomopoz@gmail.com> | 2015-02-21 14:53:17 +0100 |
---|---|---|
committer | jackpoz <giacomopoz@gmail.com> | 2015-02-21 14:53:17 +0100 |
commit | d2396fb897a4a2f21a4b43f8c37f3a87c4285f2c (patch) | |
tree | 9d0432255f831df476e3e0b1ca945d22a548bf12 | |
parent | 68fceee10e6eede180ca444a2a7f2af2fe4ba5dc (diff) |
Core/Misc: Fix static analysis issues
Fix some static analysis issues reported by Coverity
-rw-r--r-- | src/server/game/Handlers/PetitionsHandler.cpp | 13 | ||||
-rw-r--r-- | src/server/game/Server/Packets/NPCPackets.h | 4 | ||||
-rw-r--r-- | src/server/game/Server/Packets/SpellPackets.h | 4 | ||||
-rw-r--r-- | src/server/game/Spells/SpellHistory.cpp | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index bb658612f25..6dd8d95bbf6 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -177,7 +177,9 @@ void WorldSession::HandlePetitionShowSignatures(WorldPackets::Petition::Petition signature.Choice = 0; signaturesPacket.Signatures.push_back(signature); - result->NextRow(); + // Checking the return value just to be double safe + if (!result->NextRow()) + break; } SendPacket(signaturesPacket.Write()); @@ -447,7 +449,9 @@ void WorldSession::HandleOfferPetition(WorldPackets::Petition::OfferPetition& pa signature.Choice = 0; signaturesPacket.Signatures.push_back(signature); - result->NextRow(); + // Checking the return value just to be double safe + if (!result->NextRow()) + break; } player->GetSession()->SendPacket(signaturesPacket.Write()); @@ -551,7 +555,10 @@ void WorldSession::HandleTurnInPetition(WorldPackets::Petition::TurnInPetition& { Field* fields = result->Fetch(); guild->AddMember(ObjectGuid::Create<HighGuid::Player>(fields[0].GetUInt64())); - result->NextRow(); + + // Checking the return value just to be double safe + if (!result->NextRow()) + break; } SQLTransaction trans = CharacterDatabase.BeginTransaction(); diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h index bce5dbbd074..e02fd21dd39 100644 --- a/src/server/game/Server/Packets/NPCPackets.h +++ b/src/server/game/Server/Packets/NPCPackets.h @@ -85,8 +85,8 @@ namespace WorldPackets void Read() override; ObjectGuid GossipUnit; - int32 GossipIndex; - int32 GossipID; + int32 GossipIndex = 0; + int32 GossipID = 0; std::string PromotionCode; }; diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h index da877afbf8d..269bf1e5935 100644 --- a/src/server/game/Server/Packets/SpellPackets.h +++ b/src/server/game/Server/Packets/SpellPackets.h @@ -226,8 +226,8 @@ namespace WorldPackets void Read() override; - uint8 PackSlot; - uint8 Slot; + uint8 PackSlot = 0; + uint8 Slot = 0; ObjectGuid CastItem; SpellCastRequest Cast; }; diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index 4ad1311c10b..658498e7455 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -640,7 +640,7 @@ void SpellHistory::LockSpellSchool(SpellSchoolMask schoolMask, uint32 lockoutTim else if (Pet* petOwner = _owner->ToPet()) { for (auto const& p : petOwner->m_spells) - if (p.second.state != PLAYERSPELL_REMOVED) + if (p.second.state != PETSPELL_REMOVED) knownSpells.insert(p.first); } else |