Merge branch 'wip/smcv/gdbus-test-leak' into 'master'

gdbus-serialization: Don't leak string containing first serialization

See merge request GNOME/glib!1906
This commit is contained in:
Philip Withnall 2021-01-29 16:31:42 +00:00
commit 9a34c35c2b

View File

@ -524,6 +524,7 @@ get_and_check_serialization (GVariant *value)
GDBusMessage *recovered_message;
GError *error;
DBusError dbus_error;
gchar *last_serialization = NULL;
gchar *s = NULL;
guint n;
@ -617,11 +618,19 @@ get_and_check_serialization (GVariant *value)
}
g_object_unref (recovered_message);
g_free (blob);
if (last_serialization != NULL)
{
g_assert_cmpstr (last_serialization, ==, s);
g_free (last_serialization);
}
last_serialization = g_steal_pointer (&s);
}
g_object_unref (message);
return g_steal_pointer (&s);
return g_steal_pointer (&last_serialization);
}
/* If @value is floating, this assumes ownership. */