swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity

fix some cppcheck detected (potential) issues

Browse Source
This commit is contained in:
DarthArgus
2016-02-03 02:00:56 -06:00
parent 095ef804c4
commit adf7f67682
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/core/ReportManager.cpp
+1
View File
@@ -123,6 +123,7 @@ void ReportManager::addReport(Unicode::String const &reportingName, NetworkId co
if (((systemTime - iterReportThrottle->second) >= s_throttleTime))
{
s_reportThrottle.erase(iterReportThrottle);
break;
}
}
}
engine/server/library/serverGame/src/shared/object/PlayerObject.cpp
+2 -2
View File
@@ -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;
}