From 520bddecc3cd89e58df663b1f0cc5e8bad731d09 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Wed, 7 Sep 2022 21:24:37 -0700 Subject: [PATCH] Add bounds check for cli command Output a message if a bad command is used. Update MasterServer.cpp --- dMasterServer/MasterServer.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dMasterServer/MasterServer.cpp b/dMasterServer/MasterServer.cpp index 630aba87..b00456b6 100644 --- a/dMasterServer/MasterServer.cpp +++ b/dMasterServer/MasterServer.cpp @@ -211,13 +211,15 @@ int main(int argc, char** argv) { if (strcmp(argv[2], "TruncateBrokenModels") == 0) { uint32_t numberOfTruncatedModels = BrickByBrickFix::TruncateBrokenBrickByBrickXml(); Game::logger->Log("MasterServer", "%i models were truncated from the database.", numberOfTruncatedModels); - } - - // Updates old Brick-by-Brick models to use sd0 compression - // as opposed to zlib compression - if (strcmp(argv[2], "UpdateOldModels") == 0) { + } else if (strcmp(argv[2], "UpdateOldModels") == 0) { + // Updates old Brick-by-Brick models to use sd0 compression + // as opposed to zlib compression uint32_t numberOfUpdatedModels = BrickByBrickFix::UpdateBrickByBrickModelsToSd0(); Game::logger->Log("MasterServer", "%i models were updated from zlib to sd0.", numberOfUpdatedModels); + } else { + Game::logger->Log( + "MasterServer", "Invalid brick-by-brick command <%s>." + "Valid commands are TruncateBrokenModels and UpdateOldModels", argv[2]); } FinalizeShutdown(); }