From 55d227ef8b423b8ad00ce9618f9f7cdb9b7b920c Mon Sep 17 00:00:00 2001 From: peter1138 Date: Mon, 10 May 2010 17:27:34 +0000 Subject: [PATCH] (svn r19782) -Fix [FS#3828]: NULL pointer deference when testing relative scope *action2 on an unbuilt engine. --- src/newgrf_engine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index ff22015dcc..fcb4c764c2 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -374,6 +374,7 @@ static inline const Vehicle *GRV(const ResolverObject *object) case VSG_SCOPE_SELF: return object->u.vehicle.self; case VSG_SCOPE_PARENT: return object->u.vehicle.parent; case VSG_SCOPE_RELATIVE: { + if (object->u.vehicle.self == NULL) return NULL; const Vehicle *v = NULL; switch (GB(object->count, 6, 2)) { default: NOT_REACHED();