diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 4bb0ba4004..ce2f9b44f0 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -2026,6 +2026,14 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, cons const byte *layout = buf->ReadBytes(length * number); statspec->layouts[length - 1][number - 1].assign(layout, layout + length * number); + + /* Validate tile values are only the permitted 00, 02, 04 and 06. */ + for (auto &tile : statspec->layouts[length - 1][number - 1]) { + if ((tile & 6) != tile) { + grfmsg(1, "StationChangeInfo: Invalid tile %u in layout %ux%u", tile, length, number); + tile &= 6; + } + } } break;