Check that occupied_track is not null before accessing it

[r2c2.git] / source / libr2c2 / trainrouteplanner.cpp

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index e8b5d90107b59b7dad25a455d0f7d4bc678c2a5b..3f8739347d455405f1f2a6fef03c6b2c02c5e3a9 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -175,7 +175,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState
 
 TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 {
-       if(!--occupied_tracks->refcount)
+       if(occupied_tracks && !--occupied_tracks->refcount)
                delete occupied_tracks;
 }
 
@@ -184,7 +184,7 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c
        return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
 }
 
-bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const
+bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const
 {
        OccupiedTrack *occ = occupied_tracks;
        for(unsigned n=occ->n_tracks; n>0; --n, occ=occ->next)
@@ -362,7 +362,7 @@ bool TrainRoutePlanner::RoutingStep::check_deadlocks() const
 int TrainRoutePlanner::RoutingStep::get_occupant(Track &track) const
 {
        for(unsigned i=0; i<trains.size(); ++i)
-               if(trains[i].is_occupied(track))
+               if(trains[i].is_occupying(track))
                        return i;
 
        return -1;