X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=f8a95af49a195197042218fb16176f955030c39d;hb=43d1577839df81d3746092f11ebd1280ca2f85c1;hp=bdceba1f5038a7587df82004a0843dfadb8f595e;hpb=743c10e4ca5acd45e670b335a07b5bf3ab754ab6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index bdceba1f5..f8a95af49 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -193,9 +193,10 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
 	Visibility = NULL;
 	ip = NULL;
 	MyClass = NULL;
+	io = NULL;
+	AllowedUserModes = NULL;
+	AllowedChanModes = NULL;
 	AllowedOperCommands = NULL;
-	memset(AllowedUserModes, 0, sizeof(AllowedUserModes));
-	memset(AllowedChanModes, 0, sizeof(AllowedChanModes));
 	chans.clear();
 	invites.clear();
 	memset(modes,0,sizeof(modes));
@@ -231,6 +232,18 @@ User::~User()
 		AllowedOperCommands = NULL;
 	}
 
+	if (this->AllowedUserModes)
+	{
+		delete[] AllowedUserModes;
+		AllowedUserModes = NULL;
+	}
+
+	if (this->AllowedChanModes)
+	{
+		delete[] AllowedChanModes;
+		AllowedChanModes = NULL;
+	}
+
 	this->InvalidateCache();
 	this->DecrementModes();
 
@@ -447,6 +460,9 @@ bool User::HasModePermission(unsigned char mode, ModeType type)
 	if (!IS_OPER(this))
 		return false;
 
+	if (!AllowedUserModes || !AllowedChanModes)
+		return false;
+
 	return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
 	
 }
@@ -683,6 +699,15 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 			else
 				AllowedOperCommands = new std::map<std::string, bool>;
 
+			if (!AllowedChanModes)
+				AllowedChanModes = new bool[64];
+
+			if (!AllowedUserModes)
+				AllowedUserModes = new bool[64];
+
+			memset(AllowedUserModes, 0, 64);
+			memset(AllowedChanModes, 0, 64);
+
 			char* Classes = strdup(iter_opertype->second);
 			char* myclass = strtok_r(Classes," ",&savept);
 			while (myclass)
@@ -703,7 +728,7 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 					{
 						if (*c == '*')
 						{
-							memset(this->AllowedUserModes, (int)(true), sizeof(this->AllowedUserModes));
+							memset(this->AllowedUserModes, (int)(true), 64);
 						}
 						else
 						{
@@ -714,7 +739,7 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 					{
 						if (*c == '*')
 						{
-							memset(this->AllowedChanModes, (int)(true), sizeof(this->AllowedChanModes));
+							memset(this->AllowedChanModes, (int)(true), 64);
 						}
 						else
 						{
@@ -768,6 +793,17 @@ void User::UnOper()
 			delete AllowedOperCommands;
 			AllowedOperCommands = NULL;
 		}
+		if (AllowedUserModes)
+		{
+			delete[] AllowedUserModes;
+			AllowedUserModes = NULL;
+		}
+		if (AllowedChanModes)
+		{
+			delete[] AllowedChanModes;
+			AllowedChanModes = NULL;
+		}
+
 	}
 }
 
@@ -1130,14 +1166,14 @@ void User::Write(std::string text)
 		return;
 	}
 
-	if (ServerInstance->Config->GetIOHook(this->GetPort()))
+	if (this->io)
 	{
 		/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
 		 * implement their own buffering mechanisms
 		 */
 		try
 		{
-			ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length());
+			this->io->OnRawSocketWrite(this->fd, text.data(), text.length());
 		}
 		catch (CoreException& modexcept)
 		{