colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared/compat: Fix memory handling of nm_setting_vpn_get_*_keys (v2)

Browse Source 
The compat implementations return a (transfer none) strv instead of a
(transfer container) one. This has caused double frees in nm-applet:
https://bugs.archlinux.org/task/56772

We still need to copy the keys because nm_setting_vpn_foreach_* provides
us with copies that are freed after the iteration.

Fix this by handing out a duplicate of the array.

Fixes: 272439cb20

https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html
This commit is contained in:
Jan Alexander Steffens (heftig)
2017-12-21 20:36:49 +01:00
committed by Thomas Haller
parent 64fcfc62bb
commit 76207194d1
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
shared/nm-utils/nm-compat.c
View File

@@ -44,25 +44,32 @@ _get_keys (NMSettingVpn *setting,
nm_assert (NM_IS_SETTING_VPN (setting)); nm_assert (NM_IS_SETTING_VPN (setting));
a = g_ptr_array_new (); if (is_secrets)
len = nm_setting_vpn_get_num_secrets (setting);
else
len = nm_setting_vpn_get_num_data_items (setting);
a = g_ptr_array_new_full (len + 1, (GDestroyNotify) g_free);
if (is_secrets) if (is_secrets)
nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a); nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
else else
nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a); nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
len = a->len; len = a->len;
if (a->len) { if (len) {
g_ptr_array_sort (a, nm_strcmp_p); g_ptr_array_sort (a, nm_strcmp_p);
g_ptr_array_add (a, NULL); g_ptr_array_add (a, NULL);
keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE); keys = g_memdup (a->pdata, a->len * sizeof *keys);
/* we need to cache the keys *somewhere*. */ /* we need to cache the keys *somewhere*. */
g_object_set_qdata_full (G_OBJECT (setting), g_object_set_qdata_full (G_OBJECT (setting),
is_secrets is_secrets
? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys") ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
: NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"), : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
keys, g_ptr_array_ref (a),
(GDestroyNotify) g_strfreev); (GDestroyNotify) g_ptr_array_unref);
} }
NM_SET_OUT (out_length, len); NM_SET_OUT (out_length, len);