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

Prevent signed overflow of lookahead position

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-02-02 22:02:44 +00:00
parent 351cf27719
commit a9b82b817b
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/train_cmd.cpp
View File

@@ -884,6 +884,20 @@ static void AdvanceLookAheadPosition(Train *v)
return; return;
} }
if (unlikely(v->lookahead->current_position >= (1 << 30))) {
/* Prevent signed overflow by rebasing all position values */
const int32 old_position = v->lookahead->current_position;
v->lookahead->current_position = 0;
v->lookahead->reservation_end_position -= old_position;
for (TrainReservationLookAheadItem &item : v->lookahead->items) {
item.start -= old_position;
item.end -= old_position;
}
for (TrainReservationLookAheadCurve &curve : v->lookahead->curves) {
curve.position -= old_position;
}
}
while (!v->lookahead->items.empty() && v->lookahead->items.front().end < v->lookahead->current_position) { while (!v->lookahead->items.empty() && v->lookahead->items.front().end < v->lookahead->current_position) {
if (v->lookahead->items.front().type == TRLIT_STATION) { if (v->lookahead->items.front().type == TRLIT_STATION) {
int trim_position = v->lookahead->current_position - 4; int trim_position = v->lookahead->current_position - 4;