From: Matthias Clasen Date: Sun, 23 Dec 2007 05:50:26 +0000 (+0000) Subject: Don't fail to load modules with suffix .la. (#480122, Andrey Tsyvarev) X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b15b1eb10e93ecca448c2faa4ddb1e43a59fa280;p=dana%2Fcg-glib.git Don't fail to load modules with suffix .la. (#480122, Andrey Tsyvarev) 2007-12-22 Matthias Clasen * 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 5d33f1df..a14698a1 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +2007-12-22 Matthias Clasen + + * gmodule.c (g_module_open): Don't fail to load modules + with suffix .la. (#480122, Andrey Tsyvarev) + 2007-12-20 Matthias Clasen * === Released 2.15.0 === diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c index 06167da0..40e9e2e6 100644 --- 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,