mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some small memory leaks related to gtk_tree_model_get_path()

Browse source 
From the GTK docs on gtk_tree_model_get_path():
"Returns a newly-created GtkTreePath referenced by iter.
This path should be freed with gtk_tree_path_free()."

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2012-12-22 23:34:19 +02:00 • committed by Dirk Hohndel
parent 50aa6d1afa
commit b10ebbda61
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
divelist.c
View file

@ -131,11 +131,14 @@ static void first_leaf(GtkTreeModel *model, GtkTreeIter *iter, int *diveidx)
while (*diveidx < 0) { while (*diveidx < 0) {
memcpy(&parent, iter, sizeof(parent)); memcpy(&parent, iter, sizeof(parent));
tpath = gtk_tree_model_get_path(model, &parent); tpath = gtk_tree_model_get_path(model, &parent);
if (!gtk_tree_model_iter_children(model, iter, &parent)) if (!gtk_tree_model_iter_children(model, iter, &parent)) {
/* we should never have a parent without child */ /* we should never have a parent without child */
gtk_tree_path_free(tpath);
return; return;
}
if(!gtk_tree_view_row_expanded(GTK_TREE_VIEW(dive_list.tree_view), tpath)) if(!gtk_tree_view_row_expanded(GTK_TREE_VIEW(dive_list.tree_view), tpath))
gtk_tree_view_expand_row(GTK_TREE_VIEW(dive_list.tree_view), tpath, FALSE); gtk_tree_view_expand_row(GTK_TREE_VIEW(dive_list.tree_view), tpath, FALSE);
gtk_tree_path_free(tpath);
gtk_tree_model_get(model, iter, DIVE_INDEX, diveidx, -1); gtk_tree_model_get(model, iter, DIVE_INDEX, diveidx, -1);
} }
} }
@ -1644,6 +1647,7 @@ static void turn_dive_into_trip(GtkTreePath *path)
newiter = move_dive_between_trips(&iter, NULL, &newparent, NULL, FALSE); newiter = move_dive_between_trips(&iter, NULL, &newparent, NULL, FALSE);
treepath = gtk_tree_model_get_path(MODEL(dive_list), newiter); treepath = gtk_tree_model_get_path(MODEL(dive_list), newiter);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath); gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath);
gtk_tree_path_free(treepath);
dive = get_dive(idx); dive = get_dive(idx);
create_and_hookup_trip_from_dive(dive); create_and_hookup_trip_from_dive(dive);
free(newiter); free(newiter);
@ -1688,13 +1692,17 @@ static void insert_trip_before(GtkTreePath *path)
dive = get_dive(idx); dive = get_dive(idx);
add_dive_to_trip(dive, new_divetrip); add_dive_to_trip(dive, new_divetrip);
free(move_dive_between_trips(&nextsibling, &parent, &newparent, NULL, FALSE)); free(move_dive_between_trips(&nextsibling, &parent, &newparent, NULL, FALSE));
if (gtk_tree_path_compare(path, treepath) == 0) if (gtk_tree_path_compare(path, treepath) == 0) {
/* we copied the dive we were called with; we are done */ /* we copied the dive we were called with; we are done */
gtk_tree_path_free(treepath);
break; break;
}
gtk_tree_path_free(treepath);
} }
/* treat this divetrip as if it had been read from a file */ /* treat this divetrip as if it had been read from a file */
treepath = gtk_tree_model_get_path(MODEL(dive_list), &newparent); treepath = gtk_tree_model_get_path(MODEL(dive_list), &newparent);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath); gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath);
gtk_tree_path_free(treepath);
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP
dump_trip_list(); dump_trip_list();
#endif #endif
@ -1978,6 +1986,7 @@ void remember_tree_state()
if (trip) if (trip)
trip->expanded = TRUE; trip->expanded = TRUE;
} }
gtk_tree_path_free(path);
} while (gtk_tree_model_iter_next(TREEMODEL(dive_list), &iter)); } while (gtk_tree_model_iter_next(TREEMODEL(dive_list), &iter));
} }