luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 14:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

girepository: Fix NULL return from g_irepository_get_dependencies()

Browse Source 
If a typelib had no dependencies, g_irepository_get_dependencies() would
return NULL, rather than an empty NULL-terminated vector.

https://bugzilla.gnome.org/show_bug.cgi?id=743782
This commit is contained in:
Philip Withnall 2015-01-31 22:22:16 +00:00 committed by Philip Withnall
parent 2825bd2edc
commit 3128c1e9a5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
girepository.c
View File

@ -253,6 +253,8 @@ build_typelib_key (const char *name, const char *source)
return g_string_free (str, FALSE); return g_string_free (str, FALSE);
} }
/* Note: Returns %NULL (not an empty %NULL-terminated array) if there are no
* dependencies. */
static char ** static char **
get_typelib_dependencies (GITypelib *typelib) get_typelib_dependencies (GITypelib *typelib)
{ {
@ -450,6 +452,7 @@ g_irepository_get_dependencies (GIRepository *repository,
const char *namespace) const char *namespace)
{ {
GITypelib *typelib; GITypelib *typelib;
gchar **deps;
g_return_val_if_fail (namespace != NULL, NULL); g_return_val_if_fail (namespace != NULL, NULL);
@ -458,7 +461,12 @@ g_irepository_get_dependencies (GIRepository *repository,
typelib = get_registered (repository, namespace, NULL); typelib = get_registered (repository, namespace, NULL);
g_return_val_if_fail (typelib != NULL, NULL); g_return_val_if_fail (typelib != NULL, NULL);
return get_typelib_dependencies (typelib); /* Ensure we always return a non-%NULL vector. */
deps = get_typelib_dependencies (typelib);
if (deps == NULL)
deps = g_strsplit ("", "|", 0);
return deps;
} }
/** /**