(svn r19298) -Fix: [NewGRF] segfault when station vars 0xF2/0xF3 is accessed when there is no truck/bus stop

15 years ago · 9c77ff3352
parent 1cd347bfc9
commit 9c77ff3352
1 changed files with 2 additions and 2 deletions
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@ -525,8 +525,8 @@ uint32 Station::GetNewGRFVariable(const ResolverObject *object, byte variable, b

 		case 0x8A: return this->had_vehicle_of_type;
 		case 0xF1: return this->airport_type;
-		case 0xF2: return this->truck_stops->status;
-		case 0xF3: return this->bus_stops->status;
+		case 0xF2: return (this->truck_stops != NULL) ? this->truck_stops->status : 0;
+		case 0xF3: return (this->bus_stops != NULL)   ? this->bus_stops->status   : 0;
 		case 0xF6: return this->airport_flags;
 		case 0xF7: return GB(this->airport_flags, 8, 8);
 	}