diff options
| author | Dan Williams <dcbw@redhat.com> | 2016-06-17 13:34:30 -0500 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-28 17:34:42 +0200 |
| commit | 8a827b1b4f7432d3061a57b4ace8e4b9822899b5 (patch) | |
| tree | e4019c423ca189b0c7f3ad620397a67240f038c0 | |
| parent | 425ae4fbd2cfea5549d3cfbedf1b84f367ba87af (diff) | |
| download | NetworkManager-8a827b1b4f7432d3061a57b4ace8e4b9822899b5.tar.gz | |
wwan/ofono: fix a few more memory leaks
| -rw-r--r-- | src/devices/wwan/nm-modem-ofono.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c index f1a526cdfe..4fc989d042 100644 --- a/src/devices/wwan/nm-modem-ofono.c +++ b/src/devices/wwan/nm-modem-ofono.c @@ -359,7 +359,7 @@ sim_property_changed (GDBusProxy *proxy, static void sim_get_properties_done (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { - NMModemOfono *self = NM_MODEM_OFONO (user_data); + gs_unref_object NMModemOfono *self = NM_MODEM_OFONO (user_data); GError *error = NULL; GVariant *v_properties, *v_dict, *v; GVariantIter i; @@ -513,7 +513,7 @@ connman_property_changed (GDBusProxy *proxy, static void connman_get_properties_done (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { - NMModemOfono *self = NM_MODEM_OFONO (user_data); + gs_unref_object NMModemOfono *self = NM_MODEM_OFONO (user_data); GError *error = NULL; GVariant *v_properties, *v_dict, *v; GVariantIter i; @@ -684,7 +684,7 @@ modem_property_changed (GDBusProxy *proxy, static void modem_get_properties_done (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { - NMModemOfono *self = NM_MODEM_OFONO (user_data); + gs_unref_object NMModemOfono *self = NM_MODEM_OFONO (user_data); GError *error = NULL; GVariant *v_properties, *v_dict, *v; GVariantIter i; @@ -758,7 +758,7 @@ nm_modem_ofono_new (const char *path) static void stage1_prepare_done (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { - NMModemOfono *self = NM_MODEM_OFONO (user_data); + gs_unref_object NMModemOfono *self = NM_MODEM_OFONO (user_data); NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self); GError *error = NULL; @@ -1034,7 +1034,7 @@ static_stage3_ip4_config_start (NMModem *_self, static void context_proxy_new_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { - NMModemOfono *self = NM_MODEM_OFONO (user_data); + gs_unref_object NMModemOfono *self = NM_MODEM_OFONO (user_data); NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self); GError *error = NULL; @@ -1195,7 +1195,7 @@ act_stage1_prepare (NMModem *modem, static void modem_proxy_new_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { - NMModemOfono *self = NM_MODEM_OFONO (user_data); + gs_unref_object NMModemOfono *self = NM_MODEM_OFONO (user_data); NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self); GError *error = NULL; @@ -1226,8 +1226,6 @@ modem_proxy_new_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) NULL, (GAsyncReadyCallback) modem_get_properties_done, g_object_ref (self)); - - g_object_unref (self); } static void @@ -1251,9 +1249,9 @@ bus_connected (NMModemOfono *self) static void bus_get_ready (GObject *source, GAsyncResult *result, - NMModemOfono *self) + gpointer user_data) { - /* Note we always get an extra reference to self here */ + gs_unref_object NMModemOfono *self = NM_MODEM_OFONO (user_data); NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self); GError *error = NULL; @@ -1269,9 +1267,6 @@ bus_get_ready (GObject *source, /* Got the bus, ensure client */ bus_connected (self); } - - /* Balance refcount */ - g_object_unref (self); } static gboolean |