Fixed commands not registering properly when given strings are not persistent (#240)

* Fixed names starting with / and ! (and probably others, as well) not being registered properly.

* Reverted previous fix.

Added proposed fix by storing the strdup in the object itself and freeing it upon deletion. This fixes a memory leak in the original fix.

* Added the object->m_Name to the insert call instead of using the given szName instance.

* Fixed compiler error on free().

Author: satoon101

src/core/modules/commands/commands_client.cpp

@@ -68,7 +68,7 @@ CClientCommandManager* GetClientCommand(const char* szName)
 	if (!find_manager<ClientCommandMap, ClientCommandMap::iterator>(g_ClientCommandMap, szName, iter))
 	{
 		manager = new CClientCommandManager(szName);
-		g_ClientCommandMap.insert(std::make_pair(szName, manager));
+		g_ClientCommandMap.insert(std::make_pair(manager->m_Name, manager));
 	}
 	else
 	{
@@ -153,14 +153,15 @@ PLUGIN_RESULT DispatchClientCommand(edict_t* pEntity, const CCommand &command)
 //-----------------------------------------------------------------------------
 CClientCommandManager::CClientCommandManager(const char* szName)
 {
-	m_Name = szName;
+	m_Name = strdup(szName);
 }
 
 //-----------------------------------------------------------------------------
 // CClientCommandManager destructor.
 //-----------------------------------------------------------------------------
 CClientCommandManager::~CClientCommandManager()
 {
+	free((char*)m_Name);
 }
 
 //-----------------------------------------------------------------------------

src/core/modules/commands/commands_say.cpp

@@ -102,7 +102,7 @@ CSayCommandManager* GetSayCommand(const char* szName)
 	if (!find_manager<SayCommandMap, SayCommandMap::iterator>(g_SayCommandMap, szName, iter))
 	{
 		manager = new CSayCommandManager(szName);
-		g_SayCommandMap.insert(std::make_pair(szName, manager));
+		g_SayCommandMap.insert(std::make_pair(manager->m_Name, manager));
 	}
 	else
 	{
@@ -288,14 +288,15 @@ void SayConCommand::Dispatch( const CCommand& command )
 //-----------------------------------------------------------------------------
 CSayCommandManager::CSayCommandManager(const char* szName)
 {
-	m_Name = szName;
+	m_Name = strdup(szName);
 }
 
 //-----------------------------------------------------------------------------
 // CSayCommandManager destructor.
 //-----------------------------------------------------------------------------
 CSayCommandManager::~CSayCommandManager()
 {
+	free((char*)m_Name);
 }
 
 //-----------------------------------------------------------------------------

src/core/modules/commands/commands_server.cpp

@@ -87,7 +87,7 @@ CServerCommandManager* GetServerCommand(const char* szName,
 	if (!find_manager<ServerCommandMap, ServerCommandMap::iterator>(g_ServerCommandMap, szName, iter))
 	{
 		manager = CServerCommandManager::CreateCommand(szName, szHelpText, iFlags);
-		g_ServerCommandMap.insert(std::make_pair(szName, manager));
+		g_ServerCommandMap.insert(std::make_pair(manager->m_Name, manager));
 	}
 	else
 	{
@@ -148,7 +148,7 @@ CServerCommandManager::CServerCommandManager(ConCommand* pConCommand,
 	ConCommand(szName, (FnCommandCallback_t)NULL, szHelpText, iFlags),
 	m_pOldCommand(pConCommand)
 {
-	m_Name = szName;
+	m_Name = strdup(szName);
 }
 
 //-----------------------------------------------------------------------------
@@ -168,6 +168,8 @@ CServerCommandManager::~CServerCommandManager()
 		// Re-register the old command instance
 		g_pCVar->RegisterConCommand(m_pOldCommand);
 	}
+
+	free((char*)m_Name);
 }
 
 //-----------------------------------------------------------------------------