diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-12-23 05:50:26 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-12-23 05:50:26 +0000 |
| commit | b15b1eb10e93ecca448c2faa4ddb1e43a59fa280 (patch) | |
| tree | 7c938f8c5baf0d9b8f66f30ef2ae4e83ec531666 /gmodule | |
| parent | 2a7f1a1a9c90f84abcc45b7a05fd2b690abae434 (diff) | |
| download | glib-b15b1eb10e93ecca448c2faa4ddb1e43a59fa280.tar.gz | |
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
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 5 | ||||
| -rw-r--r-- | gmodule/gmodule.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 5d33f1df9..a14698a1f 100644 --- 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 06167da01..40e9e2e68 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, |