luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbusaddress: Clean up memory management in _g_dbus_address_parse_entry()

Browse Source 
This introduces no functional changes.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall
2019-03-15 14:20:54 +00:00
parent 131ba66160
commit e458b0168e
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gio/gdbusaddress.c
View File

@@ -516,24 +516,18 @@ _g_dbus_address_parse_entry (const gchar *address_entry,
ret = TRUE; ret = TRUE;
out: out:
g_strfreev (kv_pairs);
if (ret) if (ret)
{ {
if (out_transport_name != NULL) if (out_transport_name != NULL)
*out_transport_name = transport_name; *out_transport_name = g_steal_pointer (&transport_name);
else
g_free (transport_name);
if (out_key_value_pairs != NULL) if (out_key_value_pairs != NULL)
*out_key_value_pairs = key_value_pairs; *out_key_value_pairs = g_steal_pointer (&key_value_pairs);
else if (key_value_pairs != NULL)
g_hash_table_unref (key_value_pairs);
} }
else
{ g_clear_pointer (&key_value_pairs, g_hash_table_unref);
g_free (transport_name); g_free (transport_name);
if (key_value_pairs != NULL) g_strfreev (kv_pairs);
g_hash_table_unref (key_value_pairs);
}
return ret; return ret;
} }