glib r6273 - branches/glib-2-14/gmodule

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Jan  8 01:26:41 2008
New Revision: 6273
URL: http://svn.gnome.org/viewvc/glib?rev=6273&view=rev

Log:
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)




Modified:
   branches/glib-2-14/gmodule/ChangeLog
   branches/glib-2-14/gmodule/gmodule.c

Modified: branches/glib-2-14/gmodule/gmodule.c
==============================================================================
--- branches/glib-2-14/gmodule/gmodule.c	(original)
+++ branches/glib-2-14/gmodule/gmodule.c	Tue Jan  8 01:26:41 2008
@@ -427,8 +427,11 @@
 	  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,