Added some missing parameter checking in m_swhois

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 3e063c26b72fdda637df28d8625e0bb168fe9bef..858862e9dfa79c0ce06d05fbe9d3ddf1096fef84 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -21,10 +21,12 @@
 #include <sys/resource.h>
 #include <dlfcn.h>
 #include <getopt.h>
-/* This is just to be completely certain that the change which fixed getrusage on RH7 doesn't break anything else -- Om */  
+
+/* Some systems don't define RUSAGE_SELF. This should fix them. */
 #ifndef RUSAGE_SELF
-#define RUSAGE_SELF 0
+       #define RUSAGE_SELF 0
 #endif
+
 #endif
 
 #include <exception>
@@ -954,15 +956,15 @@ bool InspIRCd::LoadModule(const char* filename)
                        }
                }
                Module* m = NULL;
+               ircd_module* a = NULL;
                try
                {
-                       ircd_module* a = new ircd_module(this, modfile);
+                       a = new ircd_module(this, modfile);
                        factory[this->ModCount+1] = a;
                        if (factory[this->ModCount+1]->LastError())
                        {
                                this->Log(DEFAULT,"Unable to load %s: %s",modfile,factory[this->ModCount+1]->LastError());
                                snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[this->ModCount+1]->LastError());
-                               delete a;
                                return false;
                        }
                        if ((long)factory[this->ModCount+1]->factory != -1)
@@ -974,7 +976,6 @@ bool InspIRCd::LoadModule(const char* filename)
                                if (v.API != API_VERSION)
                                {
                                        delete m;
-                                       delete a;
                                        this->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION);
                                        snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
                                        return false;
@@ -1002,7 +1003,6 @@ bool InspIRCd::LoadModule(const char* filename)
                        {
                                this->Log(DEFAULT,"Unable to load %s",modfile);
                                snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint.");
-                               delete a;
                                return false;
                        }
                }
@@ -1010,9 +1010,6 @@ bool InspIRCd::LoadModule(const char* filename)
                {
                        this->Log(DEFAULT,"Unable to load %s: %s",modfile,modexcept.GetReason());
                        snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-                       if (m)
-                               delete m;
-                       delete a;
                        return false;
                }
        }