Detect infinite recursion in the zone hierarchy graph

fixes #10937

diff --git a/lib/remote/zone.cpp b/lib/remote/zone.cpp
index f58930c43c1c337b737b171eacced4e21f0ffd1a..d856b7d55bec4efd751757aea2bb8e8e24c0488c 100644 (file)
--- a/lib/remote/zone.cpp
+++ b/lib/remote/zone.cpp
@@ -32,11 +32,16 @@ void Zone::OnAllConfigLoaded(void)
        m_Parent = Zone::GetByName(GetParentRaw());
 
        Zone::Ptr zone = m_Parent;
+       int levels = 0;
 
        while (zone) {
                m_AllParents.push_back(zone);
 
                zone = Zone::GetByName(zone->GetParentRaw());
+               levels++;
+
+               if (levels > 32)
+                       BOOST_THROW_EXCEPTION(ScriptError("Infinite recursion detected while resolving zone graph. Check your zone hierarchy.", GetDebugInfo()));
        }
 }