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: 272439cb20
This commit is contained in:

committed by
Thomas Haller

parent
e7968b0048
commit
8ac8c01162
@@ -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);
|
||||
|
Reference in New Issue
Block a user