Fix infinite loop on alias expansion, found by Adam

[user/henk/code/inspircd.git] / src / modules / m_conn_join.cpp

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index b78cc85bee78d1e16ecde69eeaf5a001775ca613..ef834e55ac7e36bab1feeac71c0f126bb255b191 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -57,12 +57,11 @@ class ModuleConnJoin : public Module
 
                virtual void OnRehash(User* user)
                {
-                       ConfigReader* conf = new ConfigReader;
-                       JoinChan = conf->ReadValue("autojoin", "channel", 0);
+                       ConfigReader conf;
+                       JoinChan = conf.ReadValue("autojoin", "channel", 0);
                        Joinchans.clear();
                        if (!JoinChan.empty())
                                tokenize(JoinChan,Joinchans);
-                       delete conf;
                }
 
                virtual ~ModuleConnJoin()
@@ -71,7 +70,7 @@ class ModuleConnJoin : public Module
 
                virtual Version GetVersion()
                {
-                       return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR,API_VERSION);
+                       return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
                }
 
                virtual void OnPostConnect(User* user)