Validate troop limit commands

Author: DevOpsOfChaos

libs/s25main/buildings/nobMilitary.cpp

@@ -661,7 +661,10 @@ unsigned nobMilitary::CalcRequiredNumTroops(FrontierDistance assumedFrontierDist
 
 void nobMilitary::SetTroopLimit(const unsigned rank, const unsigned limit)
 {
-    troop_limits[rank] = limit;
+    if(rank >= NUM_SOLDIER_RANKS)
+        return;
+
+    troop_limits[rank] = std::min<unsigned>(limit, GetMaxTroopsCt());
     RegulateTroops();
 }
 

tests/s25Main/integration/testAttacking.cpp

@@ -418,6 +418,17 @@ BOOST_FIXTURE_TEST_CASE(StartAttack, AttackFixture<>)
     TestFailingAttack(gwv, milBld1Pos, attackSrc, 1u);
 }
 
+BOOST_FIXTURE_TEST_CASE(TroopLimitCommandClampsCountAndIgnoresInvalidRank, AttackFixture<>)
+{
+    const unsigned maxTroops = milBld0->GetMaxTroopsCt();
+
+    this->SetTroopLimit(milBld0Pos, 0, maxTroops + 10);
+    BOOST_TEST_REQUIRE(milBld0->GetTroopLimit(0) == maxTroops);
+
+    this->SetTroopLimit(milBld0Pos, NUM_SOLDIER_RANKS, 0);
+    BOOST_TEST_REQUIRE(milBld0->GetTroopLimit(0) == maxTroops);
+}
+
 BOOST_FIXTURE_TEST_CASE(ConquerBld, AttackFixture<>)
 {
     AddSoldiers(milBld0Pos, 1, 5);