[Gnash-commit] /srv/bzr/gnash/trunk r11520: Fix crash when loading extensions. Search in the directory we're supposed

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11520 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2009-09-24 10:56:29 +0200
message:
  Fix crash when loading extensions. Search in the directory we're supposed
  to search in.
modified:
  libbase/extension.cpp
  libbase/sharedlib.cpp

=== modified file 'libbase/extension.cpp'
--- a/libbase/extension.cpp     2009-08-24 23:26:42 +0000
+++ b/libbase/extension.cpp     2009-09-24 08:37:07 +0000
@@ -147,10 +147,10 @@
     SharedLib *sl;
     std::string symbol(module);
 
-    log_security(_("Initializing module: \"%s\" from %"), symbol, _pluginsdir);
+    log_security(_("Initializing module: \"%s\" from %s"), symbol, 
_pluginsdir);
     
     if (_plugins[module] == 0) {
-        sl = new SharedLib(module, "GNASH_PLUGINS");
+        sl = new SharedLib(_pluginsdir + "/" + module, "GNASH_PLUGINS");
         sl->openLib();
         _plugins[module] = sl;
     } else {

=== modified file 'libbase/sharedlib.cpp'
--- a/libbase/sharedlib.cpp     2009-09-01 03:09:56 +0000
+++ b/libbase/sharedlib.cpp     2009-09-24 08:36:52 +0000
@@ -103,7 +103,7 @@
         pluginsdir = PLUGINSDIR;
     }
     
-    // lt_dladdsearchdir(pluginsdir.c_str());
+    //lt_dladdsearchdir(pluginsdir.c_str());
 }
 
 SharedLib::~SharedLib()
@@ -128,26 +128,10 @@
 bool
 SharedLib::openLib (const std::string& filespec)
 {
-//    GNASH_REPORT_FUNCTION;
-    
-#if 0
-    // ltdl should use the same mallocation as us
-    lt_dlmalloc = (lt_ptr (*) (size_t)) xmalloc;
-    lt_dlfree = (void (*) (lt_ptr)) free;
-    
-#endif
-    
-    // Make sure preloaded modules are initialised
-//  LTDL_SET_PRELOADED_SYMBOLS();
     
     scoped_lock lock(_libMutex);
-    
-//     // libtool's dynamic library loader is already initialized in 
constructor
-    
-//     cerr << "Searching in " << lt_dlgetsearchpath()
-//          << "for database drivers" << endl;
 
-//    log_debug ("Trying to open shared library \"%s\"", filespec);
+    log_debug ("Trying to open shared library \"%s\"", filespec);
     _dlhandle = lt_dlopenext (filespec.c_str());
     
     if (_dlhandle == NULL) {