diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-12-20 13:23:12 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-21 09:51:10 +0100 |
| commit | 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5 (patch) | |
| tree | c04dcfb80faad4359324d33852176a397c4af24a | |
| parent | e7968b00488c4d444e4fd4c9cf7848d8146e7399 (diff) | |
| download | NetworkManager-8ac8c01162235c2c198bfaf25fb7d1a57a595ce5.tar.gz | |
shared/compat: fix memory handling of nm_setting_vpn_get_*_keys
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
Don't copy the keys and don't free the container later.
[thaller@redhat.com: patch adjusted to avoid compiler warning]
Fixes: 272439cb2077a889485dd195bb6b99ca91d3e3bf
| -rw-r--r-- | shared/nm-utils/nm-compat.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c index 22ab675de8..47035e62a1 100644 --- a/shared/nm-utils/nm-compat.c +++ b/shared/nm-utils/nm-compat.c @@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data) { GPtrArray *a = user_data; - g_ptr_array_add (a, g_strdup (key)); + g_ptr_array_add (a, (gpointer) key); } static const char ** @@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting, g_ptr_array_sort (a, nm_strcmp_p); g_ptr_array_add (a, NULL); keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE); - - /* we need to cache the keys *somewhere*. */ - g_object_set_qdata_full (G_OBJECT (setting), - is_secrets - ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys") - : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"), - keys, - (GDestroyNotify) g_strfreev); } NM_SET_OUT (out_length, len); |