X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=69f376d2c20291b4e9b2a1d489f6ab5d8e6b7995;hb=a30a0074edac353cb60e134b43fa8ff0ffb67f8b;hp=83e5f2f09c138d5de268e86a2913bf7808b74f2b;hpb=4a6fedd9324d87349a806c9c1d0ae6e7d3c1fd38;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 83e5f2f09..69f376d2c 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -6,7 +6,7 @@
  *   Copyright (C) 2016 Adam <Adam@anope.org>
  *   Copyright (C) 2014 Thomas Fargeix <t.fargeix@gmail.com>
  *   Copyright (C) 2013, 2018 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2013, 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2011 jackmcbarn <jackmcbarn@inspircd.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
@@ -146,8 +146,16 @@ class CloakUser : public ModeHandler
 			if (!cloaks)
 			{
 				/* Force creation of missing cloak */
-				creator->OnUserConnect(user);
-				cloaks = ext.get(user);
+				try
+				{
+					creator->OnUserConnect(user);
+					cloaks = ext.get(user);
+				}
+				catch (CoreException& modexcept)
+				{
+					ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Exception caught when generating cloak: " + modexcept.GetReason());
+					return MODEACTION_DENY;
+				}
 			}
 
 			// If we have a cloak then set the hostname.
@@ -485,7 +493,7 @@ class ModuleCloaking : public Module
 	void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
 	{
 		// Connecting users are handled in OnUserConnect not here.
-		if (user->registered != REG_ALL)
+		if (user->registered != REG_ALL || user->quitting)
 			return;
 
 		// Remove the cloaks and generate new ones.