Don't fail to load modules with suffix .la. (#480122, Andrey Tsyvarev)

2007-12-22  Matthias Clasen  <mclasen@redhat.com>

        * gmodule.c (g_module_open): Don't fail to load modules
        with suffix .la.  (#480122, Andrey Tsyvarev)

svn path=/trunk/; revision=6191

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 5d33f1d..a14698a 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gmodule.c (g_module_open): Don't fail to load modules
+       with suffix .la.  (#480122, Andrey Tsyvarev)
+
 2007-12-20  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.15.0 ===

diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 06167da..40e9e2e 100644 (file)
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -428,8 +428,11 @@ g_module_open (const gchar    *file_name,
          gchar *real_name = parse_libtool_archive (name);
 
          /* real_name might be NULL, but then module error is already set */
-         g_free (name);
-         name = real_name;
+         if (real_name)
+           {
+             g_free (name);
+             name = real_name;
+            }
        }
       if (name)
        handle = _g_module_open (name, (flags & G_MODULE_BIND_LAZY) != 0,