mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10423) -Fix [YAPF, r10301]: INVALID_TRACKDIR causing buffer overrun leading to desync in MP game (many thanks Rubidium)

release/0.6
KUDr 2007-07-04 00:12:02 +00:00
parent 232cfb0fc1
commit dd697570e5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/yapf/yapf_costrail.hpp
View File

@ -90,6 +90,8 @@ public:
FORCEINLINE int CurveCost(Trackdir td1, Trackdir td2) FORCEINLINE int CurveCost(Trackdir td1, Trackdir td2)
{ {
assert(IsValidTrackdir(td1));
assert(IsValidTrackdir(td2));
int cost = 0; int cost = 0;
if (TrackFollower::Allow90degTurns() if (TrackFollower::Allow90degTurns()
&& ((TrackdirToTrackdirBits(td2) & (TrackdirBits)TrackdirCrossesTrackdirs(td1)) != 0)) { && ((TrackdirToTrackdirBits(td2) & (TrackdirBits)TrackdirCrossesTrackdirs(td1)) != 0)) {
@ -265,7 +267,7 @@ public:
TILE cur(n.m_key.m_tile, n.m_key.m_td); TILE cur(n.m_key.m_tile, n.m_key.m_td);
// the previous tile will be needed for transition cost calculations // the previous tile will be needed for transition cost calculations
TILE prev = has_parent ? TILE() : TILE(n.m_parent->GetLastTile(), n.m_parent->GetLastTrackdir()); TILE prev = !has_parent ? TILE() : TILE(n.m_parent->GetLastTile(), n.m_parent->GetLastTrackdir());
EndSegmentReasonBits end_segment_reason = ESRB_NONE; EndSegmentReasonBits end_segment_reason = ESRB_NONE;