dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Verify length of binary data in CmdBuildVehicle and CmdAddPlanLine

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-03-03 20:54:29 +00:00
parent b0284c8d9e
commit 1340392497
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/command.cpp
View File

@@ -86,7 +86,7 @@ CommandProc CmdPlantTree;
CommandProc CmdMoveRailVehicle; CommandProc CmdMoveRailVehicle;
CommandProc CmdBuildVehicle; CommandProcEx CmdBuildVehicle;
CommandProc CmdSellVehicle; CommandProc CmdSellVehicle;
CommandProc CmdRefitVehicle; CommandProc CmdRefitVehicle;
CommandProc CmdSendVehicleToDepot; CommandProc CmdSendVehicleToDepot;
@@ -252,7 +252,7 @@ CommandProc CmdScheduledDispatchSetDelay;
CommandProc CmdScheduledDispatchResetLastDispatch; CommandProc CmdScheduledDispatchResetLastDispatch;
CommandProc CmdAddPlan; CommandProc CmdAddPlan;
CommandProc CmdAddPlanLine; CommandProcEx CmdAddPlanLine;
CommandProc CmdRemovePlan; CommandProc CmdRemovePlan;
CommandProc CmdRemovePlanLine; CommandProc CmdRemovePlanLine;
CommandProc CmdChangePlanVisibility; CommandProc CmdChangePlanVisibility;

6
src/plans_cmd.cpp
View File

@@ -51,16 +51,18 @@ CommandCost CmdAddPlan(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2
* @param flags type of operation * @param flags type of operation
* @param p1 plan id * @param p1 plan id
* @param p2 number of nodes * @param p2 number of nodes
* @param text list of tile indexes that compose the line, encoded in base64 * @param text list of tile indexes that compose the line
* @param binary_length binary length of text
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdAddPlanLine(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) CommandCost CmdAddPlanLine(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text, uint32 binary_length)
{ {
Plan *p = Plan::GetIfValid(p1); Plan *p = Plan::GetIfValid(p1);
if (p == NULL) return CMD_ERROR; if (p == NULL) return CMD_ERROR;
CommandCost ret = CheckOwnership(p->owner); CommandCost ret = CheckOwnership(p->owner);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
if (p2 > (MAX_CMD_TEXT_LENGTH / sizeof(TileIndex))) return_cmd_error(STR_ERROR_TOO_MANY_NODES); if (p2 > (MAX_CMD_TEXT_LENGTH / sizeof(TileIndex))) return_cmd_error(STR_ERROR_TOO_MANY_NODES);
if (!text || binary_length != p2 * 4) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
PlanLine *pl = p->NewLine(); PlanLine *pl = p->NewLine();
if (!pl) return_cmd_error(STR_ERROR_NO_MORE_SPACE_FOR_LINES); if (!pl) return_cmd_error(STR_ERROR_NO_MORE_SPACE_FOR_LINES);

4
src/vehicle_cmd.cpp
View File

@@ -86,7 +86,7 @@ static CommandCost GetRefitCost(const Vehicle *v, EngineID engine_type, CargoID
* @param text used for combined build and refit command * @param text used for combined build and refit command
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text, uint32 binary_length)
{ {
/* Elementary check for valid location. */ /* Elementary check for valid location. */
if (!IsDepotTile(tile)) return CMD_ERROR; if (!IsDepotTile(tile)) return CMD_ERROR;
@@ -155,7 +155,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
} }
} }
if (value.Succeeded() && text && text[0] == 'R') { if (value.Succeeded() && binary_length == 2 && text && text[0] == 'R') {
CargoID cargo = text[1]; CargoID cargo = text[1];
if (cargo >= NUM_CARGO) return CMD_ERROR; if (cargo >= NUM_CARGO) return CMD_ERROR;
CargoID default_cargo = e->GetDefaultCargoType(); CargoID default_cargo = e->GetDefaultCargoType();