From 29e05554d77179fea485f43a0d3cbb4b9d5623fc Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Sun, 27 Dec 2009 13:38:08 +0000
Subject: [PATCH] (svn r18645) -Fix [FS#3433](r942): out-of-bounds access in
the 'Start new multiplayer game' GUI
---
src/network/network_gui.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 62378d08e2..6b39c8afec 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1139,8 +1139,8 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, 0xD7); // black background of maps list
for (uint pos = this->vscroll.GetPosition(); pos < _fios_items.Length() + 1; pos++) {
- const FiosItem *item = _fios_items.Get(pos - 1);
- if (item == this->map || (pos == 0 && this->map == NULL)) {
+ const FiosItem *item = (pos == 0) ? NULL : _fios_items.Get(pos - 1);
+ if (item == this->map) { // this->map == NULL for first item
GfxFillRect(r.left + 1, y, r.right - 1, y + FONT_HEIGHT_NORMAL - 1, 155); // show highlighted item with a different colour
}