From adf7f67682cb542c1955c329baba9be453eeb716 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 3 Feb 2016 02:00:56 -0600 Subject: [PATCH] fix some cppcheck detected (potential) issues --- .../library/serverGame/src/shared/core/ReportManager.cpp | 1 + .../library/serverGame/src/shared/object/PlayerObject.cpp | 4 ++-- .../projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/core/ReportManager.cpp b/engine/server/library/serverGame/src/shared/core/ReportManager.cpp index 4bac637e..56a474ee 100755 --- a/engine/server/library/serverGame/src/shared/core/ReportManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/ReportManager.cpp @@ -123,6 +123,7 @@ void ReportManager::addReport(Unicode::String const &reportingName, NetworkId co if (((systemTime - iterReportThrottle->second) >= s_throttleTime)) { s_reportThrottle.erase(iterReportThrottle); + break; } } } diff --git a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp index 8115ff72..1e574c40 100755 --- a/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/PlayerObject.cpp @@ -1637,9 +1637,9 @@ Crafting::CraftingError PlayerObject::fillSlot(int slotIndex, int slotOptionInde } slotOptionIndex = i; - if (slotOption->ingredients.size() != 1) + if (slotOption == NULL || slotOption->ingredients.size() != 1) { - WARNING(true, ("Ingredient %d for draft schematic %s, slot %s, has ingredient count != 1", + WARNING(true, ("slotOption is NULL or ingredient %d for draft schematic %s, slot %s, has ingredient count != 1", slotOptionIndex, m_draftSchematic->getTemplateName(), draftSlot.name.getText().c_str())); return Crafting::CE_invalidIngredientSize; } diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp index 729fda02..038ccbfa 100755 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp @@ -158,7 +158,7 @@ CSAssistGameAPIcore::CSAssistGameAPIcore(CSAssistGameAPI *api, const char *serve //fprintf(stderr, "res=%d, p=%s, host=%s, port=%d, size=%d\n", res, p, host, port, m_serverList.size()); delete [] p; } - delete host; + delete [] host; delete [] buf; m_curServer = m_serverList.begin(); GetLBHost();