Fix null dereference caused by tracking dummy

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 8731489c435cc5761f0a452b2ca6dbd5fedbaa90..70d5e7cae8b5a47d278c0199ba381f284889d693 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "dynamic.h"
 #ifndef WIN32
@@ -21,11 +19,10 @@
 
 DLLManager::DLLManager(const char *fname)
 {
-       err = NULL;
-
        if (!strstr(fname,".so"))
        {
                err = "This doesn't look like a module file to me...";
+               h = NULL;
                return;
        }
 
@@ -33,7 +30,6 @@ DLLManager::DLLManager(const char *fname)
        if (!h)
        {
                err = dlerror();
-               return;
        }
 }
 
@@ -44,24 +40,23 @@ DLLManager::~DLLManager()
                dlclose(h);
 }
 
+union init_t {
+       void* vptr;
+       Module* (*fptr)();
+};
 
-
-bool DLLManager::GetSymbol(void** v, const char* sym_name)
+Module* DLLManager::callInit()
 {
-       /*
-        * try extract a symbol from the library
-        * get any error message is there is any
-        */
+       if (!h)
+               return NULL;
 
-       if (h)
+       init_t initfn;
+       initfn.vptr = dlsym(h, MODULE_INIT_STR);
+       if (!initfn.vptr)
        {
-               dlerror(); // clear value
-               *v = dlsym(h, sym_name);
                err = dlerror();
-               if (!*v || err)
-                       return false;
+               return NULL;
        }
 
-       /* succeeded :) */
-       return true;
+       return (*initfn.fptr)();
 }