Index: code/q3_ui/ui_startserver.c
===================================================================
--- code/q3_ui/ui_startserver.c	(revision 1134)
+++ code/q3_ui/ui_startserver.c	(working copy)
@@ -272,6 +272,8 @@
 		Q_strupr( s_startserver.maplist[s_startserver.nummaps] );
 		s_startserver.mapGamebits[s_startserver.nummaps] = gamebits;
 		s_startserver.nummaps++;
+		if( s_startserver.nummaps >= MAX_SERVERMAPS )
+			break;
 	}
 	s_startserver.maxpages = (s_startserver.nummaps + MAX_MAPSPERPAGE-1)/MAX_MAPSPERPAGE;
 	s_startserver.page = 0;