From 6d2fc8eac05b76126f78e063778bfc800ffa88e7 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Wed, 30 May 2007 19:41:48 +0000
Subject: Fix bug #310 reported by Smartys, and optimize mode.cpp a bit (was
 using string comparison to identify an empty string, e.g. somestr == "", when
 we can use the much faster somestr.empty())

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7191 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modes/umode_n.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/modes')

diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index 98b97094e..c9c9e312e 100644
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -30,6 +30,10 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest
 	/* Set the bitfields */
 	if (adding)
 	{
+		/* Fix for bug #310 reported by Smartys */
+		if (!dest->modes[UM_SNOMASK])
+			memset(dest->snomasks, 0, sizeof(dest->snomasks));
+
 		parameter = dest->ProcessNoticeMasks(parameter.c_str());
 		dest->modes[UM_SNOMASK] = true;
 		if (!dest->modes[UM_SERVERNOTICE])
@@ -39,10 +43,13 @@ ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest
 		}
 		return MODEACTION_ALLOW;
 	}
-	else if (dest->modes[UM_SNOMASK] != false)
+	else
 	{
-		dest->modes[UM_SNOMASK] = false;
-		return MODEACTION_ALLOW;
+		if (dest->modes[UM_SNOMASK] != false)
+		{
+			dest->modes[UM_SNOMASK] = false;
+			return MODEACTION_ALLOW;
+		}
 	}
 
 	/* Allow the change */
-- 
cgit v1.2.3