gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22057) -Fix: waypoint conversion could (previously) silently overfill the pool and crash

Browse Source
This commit is contained in:
rubidium 2011-02-11 09:33:38 +00:00
parent 246f6fe478
commit 13fd2cd335
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/saveload/station_sl.cpp
View File

@ -75,6 +75,9 @@ void MoveBuoysToWaypoints()
/* Delete the station, so we can make it a real waypoint. */ /* Delete the station, so we can make it a real waypoint. */
delete st; delete st;
/* Stations and waypoints are in the same pool, so if a station
* is deleted there must be place for a Waypoint. */
assert(Waypoint::CanAllocateItem());
Waypoint *wp = new (index) Waypoint(xy); Waypoint *wp = new (index) Waypoint(xy);
wp->town = town; wp->town = town;
wp->string_id = train ? STR_SV_STNAME_WAYPOINT : STR_SV_STNAME_BUOY; wp->string_id = train ? STR_SV_STNAME_WAYPOINT : STR_SV_STNAME_BUOY;

2
src/saveload/waypoint_sl.cpp
View File

@ -93,6 +93,8 @@ void MoveWaypointsToBaseStations()
} }
} }
if (!Waypoint::CanAllocateItem(_old_waypoints.Length())) SlError(STR_ERROR_TOO_MANY_STATIONS_LOADING);
/* All saveload conversions have been done. Create the new waypoints! */ /* All saveload conversions have been done. Create the new waypoints! */
for (OldWaypoint *wp = _old_waypoints.Begin(); wp != _old_waypoints.End(); wp++) { for (OldWaypoint *wp = _old_waypoints.Begin(); wp != _old_waypoints.End(); wp++) {
Waypoint *new_wp = new Waypoint(wp->xy); Waypoint *new_wp = new Waypoint(wp->xy);