luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

repository: Squash memory leak in _get_func and fix up style

Browse Source
This commit is contained in:
Jasper St. Pierre 2011-12-12 16:14:57 -05:00
parent c99df8f34c
commit c18e0be549
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
giobjectinfo.c
View File

@ -756,28 +756,30 @@ _get_func(GIObjectInfo *info,
const char* symbol; const char* symbol;
GSList *parents = NULL, *l; GSList *parents = NULL, *l;
GIObjectInfo *parent_info; GIObjectInfo *parent_info;
gpointer func = NULL;
parent_info = info; parent_info = info;
while (parent_info != NULL) { while (parent_info != NULL)
parents = g_slist_prepend(parents, parent_info); {
parent_info = g_object_info_get_parent(parent_info); parents = g_slist_prepend (parents, parent_info);
} parent_info = g_object_info_get_parent (parent_info);
for (l = parents; l; l = l->next) {
GIObjectInfoRefFunction func;
parent_info = l->data;
symbol = getter(parent_info);
if (symbol == NULL)
continue;
if (g_typelib_symbol (((GIRealInfo *)parent_info)->typelib, symbol, (void**) &func)) {
g_slist_free(parents);
return func;
} }
}
g_slist_free(parents); for (l = parents; l; l = l->next)
return NULL; {
GIObjectInfoRefFunction func;
parent_info = l->data;
symbol = getter (parent_info);
if (symbol == NULL)
continue;
g_typelib_symbol (((GIRealInfo *)parent_info)->typelib, symbol, (gpointer*) &func);
if (func)
break;
}
g_slist_free_full (parents, (GDestroyNotify) g_base_info_unref);
return func;
} }
/** /**