test-variant-recursion: free our GValues and the output string correctly

Previously, if we'd freed the GValues, it would have crashed, because
g_value_take_boxed on a value of type G_TYPE_VALUE requires that the inner
GValue was g_malloc'd individually, but we were allocating them as a
block. This only "worked" because *none* of them were freed...

The returned string was also leaked; free it too, but only on success.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41129
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

1 files changed, 26 insertions, 19 deletions

diff --git a/test/core/test-variant-recursion.c b/test/core/test-variant-recursion.c
index 4229c2b..e479f65 100644
--- a/test/core/test-variant-recursion.c
+++ b/test/core/test-variant-recursion.c
@@ -13,29 +13,36 @@ make_recursive_stringify_call (int recursion_depth,
                                DBusGProxy *proxy, 
                                GError **error)
 {
-  char *out_str;
-
+  gchar *out_str;
+  gboolean ret;
   int i;
-  GValue *vals = g_new0 (GValue, recursion_depth+1);
+  GValue *val = g_new0 (GValue, 1);
 
-  for (i = recursion_depth-1; i >= 0; i--) 
-    {
-      GValue *curval = &(vals[i]);
-      g_value_init (curval, G_TYPE_VALUE);
-    }
-  for (i = 0; i < recursion_depth; i++) 
+  g_value_init (val, G_TYPE_STRING);
+  g_value_set_string (val, "end of the line");
+
+  for (i = 0; i < recursion_depth; i++)
     {
-      GValue *curval = &(vals[i]);
-      GValue *nextval = &(vals[i+1]);
-      g_value_take_boxed (curval, nextval);
+      GValue *tmp = g_new0 (GValue, 1);
+
+      g_value_init (tmp, G_TYPE_VALUE);
+      g_value_take_boxed (tmp, val);
+      val = tmp;
     }
-  g_value_init (&(vals[recursion_depth]), G_TYPE_STRING);
-  g_value_set_string (&(vals[recursion_depth]), "end of the line");
-  return dbus_g_proxy_call (proxy, "Stringify", error,
-                                G_TYPE_VALUE, &(vals[0]),
-                                G_TYPE_INVALID,
-                                G_TYPE_STRING, &out_str,
-                            G_TYPE_INVALID);
+
+  ret = dbus_g_proxy_call (proxy, "Stringify", error,
+                           G_TYPE_VALUE, val,
+                           G_TYPE_INVALID,
+                           G_TYPE_STRING, &out_str,
+                           G_TYPE_INVALID);
+
+  g_boxed_free (G_TYPE_VALUE, val);
+
+  /* the out parameter is meaningless if it failed */
+  if (ret)
+    g_free (out_str);
+
+  return ret;
 }
 
 int