# HG changeset patch
# User smatz <smatz@openttd.org>
# Date 1261921088 0
# Node ID 6d35a3f22ae1a29068b3506d043b231a7dad3744
# Parent  e3c772e8163dc78fd9f8094210e8c65ada7792fb
(svn r18645) -Fix [FS#3433](r942): out-of-bounds access in the 'Start new multiplayer game' GUI

diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -1139,8 +1139,8 @@
 		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
 			}