From 2f2688b829cc61a453f668a3fa388489ad043528 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 3 Jan 2005 22:07:40 +0000 Subject: (svn r1358) Assert bounds of depot list when searching for a depot --- roadveh_gui.c | 4 +++- ship_gui.c | 4 +++- train_gui.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/roadveh_gui.c b/roadveh_gui.c index 23c4758f1..06737a501 100644 --- a/roadveh_gui.c +++ b/roadveh_gui.c @@ -512,7 +512,9 @@ static void DrawRoadDepotWindow(Window *w) SetVScrollCount(w, (num + w->hscroll.cap - 1) / w->hscroll.cap); /* locate the depot struct */ - for(d=_depots; d->xy != (TileIndex)tile; d++) {} + for (d = _depots; d->xy != (TileIndex)tile; d++) { + assert(d < endof(_depots); + } SetDParam(0, d->town_index); DrawWindowWidgets(w); diff --git a/ship_gui.c b/ship_gui.c index 959cbd0ec..e90077aed 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -646,7 +646,9 @@ static void DrawShipDepotWindow(Window *w) SetVScrollCount(w, (num + w->hscroll.cap - 1) / w->hscroll.cap); /* locate the depot struct */ - for(d=_depots; d->xy != (TileIndex)tile; d++) {} + for (d = _depots; d->xy != (TileIndex)tile; d++) { + assert(d < endof(_depots); + } SetDParam(0, d->town_index); DrawWindowWidgets(w); diff --git a/train_gui.c b/train_gui.c index 41335d1b5..b590eb29b 100644 --- a/train_gui.c +++ b/train_gui.c @@ -333,7 +333,9 @@ static void DrawTrainDepotWindow(Window *w) SetHScrollCount(w, hnum); /* locate the depot struct */ - for(d=_depots; d->xy != (TileIndex)tile; d++) {} + for (d = _depots; d->xy != (TileIndex)tile; d++) { + assert(d < endof(_depots); + } SetDParam(0, d->town_index); DrawWindowWidgets(w); -- cgit v1.2.3-70-g09d2