mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-05-04 04:56:52 +02:00
Free string in the right place.
2008-08-26 Colin Walters <walters@verbum.org> * girepository/gtypelib.c (_g_typelib_init): Free string in the right place. svn path=/trunk/; revision=500
This commit is contained in:
parent
7f30a2502c
commit
d6139fcb45
@ -1953,6 +1953,7 @@ _g_typelib_init (GTypelib *typelib)
|
|||||||
if (typelib->module == NULL)
|
if (typelib->module == NULL)
|
||||||
{
|
{
|
||||||
shlib_full = g_string_new (shlib);
|
shlib_full = g_string_new (shlib);
|
||||||
|
|
||||||
/* Prefix with "lib", try both .la and .so */
|
/* Prefix with "lib", try both .la and .so */
|
||||||
if (!g_str_has_prefix (shlib_full->str, "lib"))
|
if (!g_str_has_prefix (shlib_full->str, "lib"))
|
||||||
g_string_prepend (shlib_full, "lib");
|
g_string_prepend (shlib_full, "lib");
|
||||||
@ -1961,11 +1962,12 @@ _g_typelib_init (GTypelib *typelib)
|
|||||||
if (typelib->module == NULL)
|
if (typelib->module == NULL)
|
||||||
g_string_overwrite (shlib_full, strlen (shlib_full->str)-2, "so");
|
g_string_overwrite (shlib_full, strlen (shlib_full->str)-2, "so");
|
||||||
typelib->module = g_module_open (shlib_full->str, G_MODULE_BIND_LAZY);
|
typelib->module = g_module_open (shlib_full->str, G_MODULE_BIND_LAZY);
|
||||||
|
|
||||||
|
g_string_free (shlib_full, TRUE);
|
||||||
}
|
}
|
||||||
if (typelib->module == NULL)
|
if (typelib->module == NULL)
|
||||||
g_warning ("Failed to load shared library '%s' referenced by the typelib: %s",
|
g_warning ("Failed to load shared library '%s' referenced by the typelib: %s",
|
||||||
shlib, g_module_error ());
|
shlib, g_module_error ());
|
||||||
g_string_free (shlib_full, TRUE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user