From 194fb6c5d5cee802cc67d0bc584f6099f30391e8 Mon Sep 17 00:00:00 2001
From: ac_stef <ac_stef@users.sourceforge.net>
Date: Sun, 28 Jun 2009 13:31:00 +0000
Subject: [PATCH] maprot sanity checks; fatal() fixed

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4546 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/server.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/src/server.cpp b/source/src/server.cpp
index 180a4868..1a2f8958 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -2241,16 +2241,17 @@ int nextcfgset(bool notify = true, bool nochange = false) // load next maprotati
     int ccs = curcfgset;
     if(ccs >= 0 && ccs < csl) ccs += configsets[ccs].skiplines;
     configset *c = NULL;
-    loopi(csl)
+    loopi(3 * csl + 1)
     {
         ccs++;
         if(ccs >= csl || ccs < 0) ccs = 0;
         c = &configsets[ccs];
-        if(n >= c->minplayer && (!c->maxplayer || n <= c->maxplayer))
+        if((n >= c->minplayer || i >= csl) && (!c->maxplayer || n <= c->maxplayer || i >= 2 * csl))
         {
             if(getservermapstats(c->mapname)) break;
             else logline(ACLOG_INFO, "maprot error: map '%s' not found", c->mapname);
         }
+        if(i >= 3 * csl) fatal("maprot unusable"); // not a single map in rotation can be found...
     }
     if(!nochange)
     {
@@ -3771,7 +3772,7 @@ void serverslice(uint timeout)   // main server update, called from cube main lo
 
 void cleanupserver()
 {
-    if(serverhost) enet_host_destroy(serverhost);
+    if(serverhost) { enet_host_destroy(serverhost); serverhost = NULL; }
     if(svcctrl)
     {
         svcctrl->stop();