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

libnm-glib: fix another memory leak around update_permissions()

Browse Source 
This time in init_async_got_permissions().

Thereby, just use gs_unref_hash and gs_free_error for cleanup.
This commit is contained in:
Thomas Haller
2016-01-26 12:17:57 +01:00
parent e0601d501a
commit 8029f59e4f
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libnm-glib/nm-client.c
View File

@@ -36,6 +36,7 @@
#include "nm-vpn-connection.h" #include "nm-vpn-connection.h"
#include "nm-object-cache.h" #include "nm-object-cache.h"
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
#include "gsystem-local-alloc.h"
void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled); void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
@@ -317,16 +318,13 @@ static gboolean
get_permissions_sync (NMClient *self, GError **error) get_permissions_sync (NMClient *self, GError **error)
{ {
gboolean success; gboolean success;
GHashTable *permissions = NULL; gs_unref_hashtable GHashTable *permissions = NULL;
success = dbus_g_proxy_call_with_timeout (NM_CLIENT_GET_PRIVATE (self)->client_proxy, success = dbus_g_proxy_call_with_timeout (NM_CLIENT_GET_PRIVATE (self)->client_proxy,
"GetPermissions", 3000, error, "GetPermissions", 3000, error,
G_TYPE_INVALID, G_TYPE_INVALID,
DBUS_TYPE_G_MAP_OF_STRING, &permissions, G_TYPE_INVALID); DBUS_TYPE_G_MAP_OF_STRING, &permissions, G_TYPE_INVALID);
update_permissions (self, success ? permissions : NULL); update_permissions (self, success ? permissions : NULL);
if (permissions)
g_hash_table_destroy (permissions);
return success; return success;
} }
@@ -336,17 +334,14 @@ get_permissions_reply (DBusGProxy *proxy,
gpointer user_data) gpointer user_data)
{ {
NMClient *self = NM_CLIENT (user_data); NMClient *self = NM_CLIENT (user_data);
GHashTable *permissions = NULL; gs_unref_hashtable GHashTable *permissions = NULL;
GError *error = NULL; gs_free_error GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_proxy_end_call (proxy, call, &error,
DBUS_TYPE_G_MAP_OF_STRING, &permissions, DBUS_TYPE_G_MAP_OF_STRING, &permissions,
G_TYPE_INVALID); G_TYPE_INVALID);
NM_CLIENT_GET_PRIVATE (self)->perm_call = NULL; NM_CLIENT_GET_PRIVATE (self)->perm_call = NULL;
update_permissions (NM_CLIENT (user_data), error ? NULL : permissions); update_permissions (NM_CLIENT (user_data), error ? NULL : permissions);
if (permissions)
g_hash_table_destroy (permissions);
g_clear_error (&error);
} }
static void static void
@@ -1932,14 +1927,13 @@ static void
init_async_got_permissions (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data) init_async_got_permissions (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
{ {
NMClientInitData *init_data = user_data; NMClientInitData *init_data = user_data;
GHashTable *permissions; gs_unref_hashtable GHashTable *permissions = NULL;
GError *error = NULL; gs_free_error GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_proxy_end_call (proxy, call, &error,
DBUS_TYPE_G_MAP_OF_STRING, &permissions, DBUS_TYPE_G_MAP_OF_STRING, &permissions,
G_TYPE_INVALID); G_TYPE_INVALID);
update_permissions (init_data->client, error ? NULL : permissions); update_permissions (init_data->client, error ? NULL : permissions);
g_clear_error (&error);
init_data->permissions_pending = FALSE; init_data->permissions_pending = FALSE;
init_async_complete (init_data); init_async_complete (init_data);