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 01daaee86b6dfc1262e9e388efc1256ac461d77d..70d5e7cae8b5a47d278c0199ba381f284889d693 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,27 +12,24 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
 #include "dynamic.h"
 #ifndef WIN32
 #include <dlfcn.h>
 #endif
 
-DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
+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;
        }
 
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-               err = (char*)dlerror();
-               return;
+               err = dlerror();
        }
 }
 
@@ -43,43 +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)
-       {
-               dlerror(); // clear value
-               *v = dlsym(h, sym_name);
-               err = (char*)dlerror();
-               if (!*v || err)
-                       return false;
-       }
-       
-       /* succeeded :) */
-       return true;
-}
+       if (!h)
+               return NULL;
 
-DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
-{
-       /* try get the factory function if there is no error yet */
-       factory_func = 0;
-       
-       if (!LastError())
+       init_t initfn;
+       initfn.vptr = dlsym(h, MODULE_INIT_STR);
+       if (!initfn.vptr)
        {
-               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
-               {
-                       throw ModuleException("Missing init_module() entrypoint!");
-               }
+               err = dlerror();
+               return NULL;
        }
-}
 
-DLLFactoryBase::~DLLFactoryBase()
-{
+       return (*initfn.fptr)();
 }
-