fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-05 18:10:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix impl_manager_get_devices() to skip non-exported objects

Browse source 
Must skip over NULL paths. Also, the previous version leaked the
object-paths as g_variant_new() doesn't take ownership.

Fixes: 34ba4e14b8
This commit is contained in:
Thomas Haller 2015-08-18 13:42:20 +02:00
parent 3dfbbb227e
commit 3697e568ba
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/nm-manager.c
View file

@ -2016,18 +2016,23 @@ impl_manager_get_devices (NMManager *self,
GDBusMethodInvocation *context)
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
GPtrArray *paths;
gs_free const char **paths = NULL;
guint i;
GSList *iter;
paths = g_ptr_array_sized_new (g_slist_length (priv->devices) + 1);
paths = g_new (const char *, g_slist_length (priv->devices) + 1);
for (iter = priv->devices; iter; iter = iter->next)
g_ptr_array_add (paths, g_strdup (nm_exported_object_get_path (NM_EXPORTED_OBJECT (iter->data))));
g_ptr_array_add (paths, NULL);
for (i = 0, iter = priv->devices; iter; iter = iter->next) {
const char *path;
path = nm_exported_object_get_path (NM_EXPORTED_OBJECT (iter->data));
if (path)
paths[i++] = path;
}
paths[i++] = NULL;
g_dbus_method_invocation_return_value (context,
g_variant_new ("(^ao)", (char **) paths->pdata));
g_ptr_array_unref (paths);
g_variant_new ("(^ao)", (char **) paths));
}
static void