1 files changed, 18 insertions, 11 deletions

diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index 30112b74a..0061bfe00 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -24,24 +24,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  */
 CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
 {
+	std::string target = parameters[0];
+		
 	if (pcnt >= 3)
 	{
 		IdentHostPair ih;
-		User* find = ServerInstance->FindNick(parameters[0]);
+		User* find = ServerInstance->FindNick(target.c_str());
 		if (find)
 		{
 			ih.first = "*";
 			ih.second = find->GetIPString();
-			std::string c = std::string("*@") + find->GetIPString();
-			parameters[0] = c.c_str();
+			target = std::string("*@") + find->GetIPString();
 		}
 		else
-			ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+			ih = ServerInstance->XLines->IdentSplit(target.c_str());
+
+		if (ih.first.empty())
+		{
+			user->WriteServ("NOTICE %s :*** Target not found", user->nick);
+			return CMD_FAILURE;
+		}
 
 		if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
 			return CMD_FAILURE;
 
-		else if (strchr(parameters[0],'!'))
+		else if (strchr(target.c_str(),'!'))
 		{
 			user->WriteServ("NOTICE %s :*** G-Line cannot operate on nick!user@host masks",user->nick);
 			return CMD_FAILURE;
@@ -53,12 +60,12 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
 		{
 			if (!duration)
 			{
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,target.c_str());
 			}
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
-				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,parameters[0],
+				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s",user->nick,target.c_str(),
 						ServerInstance->TimeString(c_requires_crap).c_str());
 			}
 
@@ -67,19 +74,19 @@ CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
 		else
 		{
 			delete gl;
-			user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** G-Line for %s already exists",user->nick,target.c_str());
 		}
 
 	}
 	else
 	{
-		if (ServerInstance->XLines->DelLine(parameters[0],"G",user))
+		if (ServerInstance->XLines->DelLine(target.c_str(),"G",user))
 		{
-			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,target.c_str());
 		}
 		else
 		{
-			user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,parameters[0]);
+			user->WriteServ("NOTICE %s :*** G-line %s not found in list, try /stats g.",user->nick,target.c_str());
 		}
 	}