diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-17 12:55:56 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-28 17:34:42 +0200 |
| commit | 5a740d323e74c73f65eb16685416c62816b6f9f6 (patch) | |
| tree | a1c30a6bcd7e8005871507c84663f99671065133 | |
| parent | 5cdb2b152038778e4822a30b8db756b55e2389b5 (diff) | |
| download | NetworkManager-5a740d323e74c73f65eb16685416c62816b6f9f6.tar.gz | |
wwan: fix memleaks
And use gs_free in ofono_check_name_owner()
| -rw-r--r-- | src/devices/wwan/nm-modem-manager.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index 54fb8865be..6eb6a7ce3b 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -291,7 +291,7 @@ static void ofono_enumerate_devices_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data) { NMModemManager *manager = NM_MODEM_MANAGER (user_data); - GError *error = NULL; + gs_free_error GError *error = NULL; GVariant *results; GVariantIter *iter; const char *path; @@ -317,13 +317,13 @@ static void ofono_appeared (NMModemManager *self); static void ofono_check_name_owner (NMModemManager *self) { - gchar *name_owner; + gs_free char *name_owner = NULL; name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (self->priv->ofono_proxy)); if (name_owner) { /* Available! */ ofono_appeared (self); - goto free; + return; } nm_log_info (LOGD_MB, "oFono disappeared from bus"); @@ -331,10 +331,6 @@ ofono_check_name_owner (NMModemManager *self) ofono_clear_signals (self); g_clear_object (&self->priv->ofono_proxy); ensure_client (self); - -free: - g_free (name_owner); - return; } static void @@ -373,8 +369,8 @@ ofono_appeared (NMModemManager *self) static void ofono_proxy_new_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) { - NMModemManager *self = NM_MODEM_MANAGER (user_data); - GError *error = NULL; + gs_unref_object NMModemManager *self = NM_MODEM_MANAGER (user_data); + gs_free_error GError *error = NULL; self->priv->ofono_proxy = g_dbus_proxy_new_finish (res, &error); @@ -384,9 +380,6 @@ ofono_proxy_new_cb (GObject *source_object, GAsyncResult *res, gpointer user_dat } ofono_appeared (self); - - /* Balance refcount */ - g_object_unref (self); } #endif |