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

String: Use MakeParameters with GetNextParameter

Browse Source 
Instead of StringParameters subspan, to avoid GSs being able to
cause subspan boundary assertion failures
This commit is contained in:
Jonathan G Rennison
2023-12-14 01:07:26 +00:00
parent 7cf6600b47
commit 164e218736
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/strings.cpp
View File

@@ -1445,7 +1445,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters &arg
} }
default: { default: {
StringParameters tmp_params(args, 1); auto tmp_params = MakeParameters(args.GetNextParameter<int64>());
buff = GetStringWithArgs(buff, cargo_str, tmp_params, last); buff = GetStringWithArgs(buff, cargo_str, tmp_params, last);
break; break;
} }
@@ -1459,7 +1459,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters &arg
if (cargo != CT_INVALID && cargo >= CargoSpec::GetArraySize()) break; if (cargo != CT_INVALID && cargo >= CargoSpec::GetArraySize()) break;
StringID cargo_str = (cargo == CT_INVALID) ? STR_QUANTITY_N_A : CargoSpec::Get(cargo)->quantifier; StringID cargo_str = (cargo == CT_INVALID) ? STR_QUANTITY_N_A : CargoSpec::Get(cargo)->quantifier;
StringParameters tmp_args(args, 1); auto tmp_args = MakeParameters(args.GetNextParameter<int64>());
buff = GetStringWithArgs(buff, cargo_str, tmp_args, last); buff = GetStringWithArgs(buff, cargo_str, tmp_args, last);
break; break;
} }
@@ -1712,7 +1712,7 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters &arg
case SCC_DEPOT_NAME: { // {DEPOT} case SCC_DEPOT_NAME: { // {DEPOT}
VehicleType vt = args.GetNextParameter<VehicleType>(); VehicleType vt = args.GetNextParameter<VehicleType>();
if (vt == VEH_AIRCRAFT) { if (vt == VEH_AIRCRAFT) {
StringParameters tmp_params = StringParameters(args, 1); auto tmp_params = MakeParameters(args.GetNextParameter<StationID>());
buff = GetStringWithArgs(buff, STR_FORMAT_DEPOT_NAME_AIRCRAFT, tmp_params, last); buff = GetStringWithArgs(buff, STR_FORMAT_DEPOT_NAME_AIRCRAFT, tmp_params, last);
break; break;
} }