Passing invalid instance to dns isnt a good idea

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index a4542760b024a52f346be6b3fcdc2d36996cebb1..c75371a39b33cdbf73d3c1684dab430ea4a9e0fa 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -17,6 +17,7 @@
 using namespace std;
 
 #include "inspircd_config.h"
+#include "configreader.h"
 #include "globals.h"
 #include "dynamic.h"
 
@@ -32,8 +33,17 @@ using namespace std;
 #include <sys/types.h>
 #include <stdio.h>
 
-DLLManager::DLLManager(char *fname)
+extern InspIRCd* ServerInstance;
+
+DLLManager::DLLManager(const char *fname)
 {
+       err = NULL;
+
+       if (!strstr(fname,".so"))
+       {
+               err = "This doesn't look like a module file to me...";
+               return;
+       }
 #ifdef STATIC_LINK
        this->staticname[0] = '\0';
        log(DEBUG,"Loading core-compiled module '%s'",fname);
@@ -55,22 +65,62 @@ DLLManager::DLLManager(char *fname)
        // shared libraries are mmap()ed and not doing this causes
        // segfaults.
        FILE* x = fopen(fname,"rb");
+       if (!x)
+       {
+               err = strerror(errno);
+               return;
+       }
+       log(DEBUG,"Opened module file %s",fname);
        char tmpfile_template[255];
        char buffer[65536];
-       snprintf(tmpfile_template, 255, "/tmp/inspircd_file.so.%d.XXXXXXXXXX",getpid());
+       snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",ServerInstance->Config->TempDir,getpid());
        int fd = mkstemp(tmpfile_template);
+       if (fd == -1)
+       {
+               fclose(x);
+               err = strerror(errno);
+               return;
+       }
+       log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
        while (!feof(x))
        {
                int n = fread(buffer, 1, 65535, x);
                if (n)
-                       write(fd,buffer,n);
+               {
+                       int written = write(fd,buffer,n);
+                       if (written != n)
+                       {
+                               fclose(x);
+                               err = strerror(errno);
+                               return;
+                       }
+               }
        }
-       
+       log(DEBUG,"Copied entire file.");
        // Try to open the library now and get any error message.
-       
-       h = dlopen(tmpfile_template, RTLD_NOW );
-       err = (char*)dlerror();
-       close(fd);
+
+       if (close(fd) == -1)
+               err = strerror(errno);
+       if (fclose(x) == EOF)
+               err = strerror(errno);
+
+       h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+       if (!h)
+       {
+               log(DEBUG,"dlerror occured!");
+               err = (char*)dlerror();
+               return;
+       }
+
+       log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
+
+       // We can delete the tempfile once it's loaded, leaving just the inode.
+       if (!err && !ServerInstance->Config->debugging)
+       {
+               log(DEBUG,"Deleteting %s",tmpfile_template);
+               if (unlink(tmpfile_template) == -1)
+                       err = strerror(errno);
+       }
 #endif
 }
 
@@ -78,8 +128,8 @@ DLLManager::~DLLManager()
 {
 #ifndef STATIC_LINK
        // close the library if it isn't null
-       if (h != 0)
-       dlclose(h);
+       if (h)
+               dlclose(h);
 #endif
 }
 
@@ -87,7 +137,7 @@ DLLManager::~DLLManager()
 
 #ifdef STATIC_LINK
 
-bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
+bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
 {
        log(DEBUG,"Symbol search...");
        for (int j = 0; modsyms[j].name; j++)
@@ -106,45 +156,52 @@ bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
 
 #else
 
-bool DLLManager::GetSymbol(void **v, char *sym_name)
+bool DLLManager::GetSymbol(void** v, const char* sym_name)
 {
        // try extract a symbol from the library
        // get any error message is there is any
        
-       if(h != 0)
+       if (h)
        {
-               *v = dlsym( h, sym_name );
+               log(DEBUG,"Found symbol %s", sym_name);
+               dlerror(); // clear value
+               *v = dlsym(h, sym_name);
                err = (char*)dlerror();
-               if( err == 0 )
-                       return true;
-               else
+               if (!*v || err)
                        return false;
        }
+       
+       if (err)
+       {
+               return false;
+       }
        else
        {       
-               return false;
+               return true;
        }
 }
 
 #endif
 
-DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(const char* fname, const char* symbol) : DLLManager(fname)
 {
        // try get the factory function if there is no error yet
-       
        factory_func = 0;
        
-       if(LastError() == 0)
+       if (!LastError())
        {
 #ifdef STATIC_LINK
-               GetSymbol( factory_func, factory ? factory : (char*)"init_module" );
+               if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
 #else
-               GetSymbol( (void **)&factory_func, factory ? factory : (char*)"init_module" );
+               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
 #endif
+               {
+                       throw ModuleException("Missing init_module() entrypoint!");
+               }
        }
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
+