filelist: fix segfault during filelist_sort()

When I converted the filelist from GList to GPtrArray, I missed that
the GCompareFunc does not actually get the pointers from
g_ptr_array_sort(), but pointers to the pointers...  run
g_ptr_array_sort_with_data() instead with a wrapper function.

diff --git a/src/filelist.c b/src/filelist.c
index 6e4ebed55d84499e126bd9703c00f63c823ecc76..59fed47020d4524f1fbfc03b7423d8d5304b6d92 100644 (file)
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -101,10 +101,22 @@ filelist_move(struct filelist *filelist, struct filelist *from)
        g_ptr_array_set_size(from->entries, 0);
 }
 
+static gint
+filelist_compare_indirect(gconstpointer ap, gconstpointer bp, gpointer data)
+{
+       GCompareFunc compare_func = data;
+       gconstpointer a = *(const gconstpointer*)ap;
+       gconstpointer b = *(const gconstpointer*)bp;
+
+       return compare_func(a, b);
+}
+
 void
 filelist_sort(struct filelist *filelist, GCompareFunc compare_func)
 {
-       g_ptr_array_sort(filelist->entries, compare_func);
+       g_ptr_array_sort_with_data(filelist->entries,
+                                  filelist_compare_indirect,
+                                  compare_func);
 }
 
 struct filelist_entry *