From a75f564af42cc4547ab5443b9747e20e3bd8c888 Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 5 Jun 2009 21:19:38 +0000 Subject: [PATCH] (svn r16521) -Fix [FS#2946] (r13945): Do not access 'compatible_railtypes' for road vehicles. (causing invalid reads since r16391/16392) --- src/yapf/follow_track.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yapf/follow_track.hpp b/src/yapf/follow_track.hpp index f670ac82db..93c4db633a 100644 --- a/src/yapf/follow_track.hpp +++ b/src/yapf/follow_track.hpp @@ -55,7 +55,7 @@ struct CFollowTrackT { assert(!IsRailTT() || (v != NULL && v->type == VEH_TRAIN)); m_veh = v; - Init(v != NULL ? v->owner : INVALID_OWNER, railtype_override == INVALID_RAILTYPES ? ((const Train *)v)->compatible_railtypes : railtype_override, pPerf); + Init(v != NULL ? v->owner : INVALID_OWNER, IsRailTT() && railtype_override == INVALID_RAILTYPES ? ((const Train *)v)->compatible_railtypes : railtype_override, pPerf); } FORCEINLINE void Init(Owner o, RailTypes railtype_override, CPerformanceTimer *pPerf)