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/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
* @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. */
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];
if (cargo >= NUM_CARGO) return CMD_ERROR;
CargoID default_cargo = e->GetDefaultCargoType();