utils: make gsignond_array_to_sequence() argument really (transfer full)

diff --git a/src/common/gsignond-identity-info.c b/src/common/gsignond-identity-info.c
index 1a0d92f..2b163ca 100644 (file)
--- a/src/common/gsignond-identity-info.c
+++ b/src/common/gsignond-identity-info.c
@@ -820,10 +820,9 @@ gsignond_identity_info_get_methods (GSignondIdentityInfo *info)
         g_variant_iter_init (&iter, var);
         while (g_variant_iter_next (&iter, "{s^as}", &vmethod, &vmechanisms))
         {
-            /* ownership of all content is transferred */
+            /* ownership is transferred */
             seq = gsignond_array_to_sequence (vmechanisms);
             g_hash_table_insert (methods, vmethod, seq);
-            g_free (vmechanisms);
         }
     }
     return methods;
@@ -920,11 +919,10 @@ gsignond_identity_info_get_mechanisms (
         g_variant_iter_init (&iter, var);
         while (g_variant_iter_next (&iter, "{s^as}", &vmethod, &vmechanisms))
         {
-            /* ownership of content is transferred */
+            /* ownership is transferred */
             if (vmethod != NULL && g_strcmp0 (vmethod, method) == 0) {
                 mechanisms = gsignond_array_to_sequence (vmechanisms);
                 g_free (vmethod);
-                g_free (vmechanisms);
                 break;
             }
             g_free (vmethod); vmethod = NULL;

diff --git a/src/common/gsignond-utils.c b/src/common/gsignond-utils.c
index 9eab088..90beeaf 100644 (file)
--- a/src/common/gsignond-utils.c
+++ b/src/common/gsignond-utils.c
@@ -368,18 +368,20 @@ gsignond_sequence_to_array (GSequence *seq)
 GSequence *
 gsignond_array_to_sequence (gchar **items)
 {
+    gchar **item_iter = items;
     GSequence *seq = NULL;
 
     if (!items) return NULL;
 
     seq = g_sequence_new ((GDestroyNotify) g_free);
-    while (*items) {
+    while (*item_iter) {
         g_sequence_insert_sorted (seq,
-                                  *items,
+                                  *item_iter,
                                   (GCompareDataFunc) _compare_strings,
                                   NULL);
-        items++;
+        item_iter++;
     }
+    g_free (items);
     return seq;
 }