diff options
| author | Milan Crha <mcrha@redhat.com> | 2016-05-27 07:30:00 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-08-17 12:07:39 -0400 |
| commit | 9f4a567da755ea726f20a970ef7081fd8e297a71 (patch) | |
| tree | 5c9612069a47a040650870ff67c29559c3254c1e | |
| parent | 077a7a482109a9f7166ab00c9ff58e8e39a370a6 (diff) | |
| download | glib-9f4a567da755ea726f20a970ef7081fd8e297a71.tar.gz | |
Fix memory leaks in GNetworkMonitorNetlink
As claimed by valgrind in a downstream bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=1317369
https://bugzilla.gnome.org/show_bug.cgi?id=766933
| -rw-r--r-- | gio/gnetworkmonitornetlink.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c index b9ff01101..776628bbe 100644 --- a/gio/gnetworkmonitornetlink.c +++ b/gio/gnetworkmonitornetlink.c @@ -295,7 +295,7 @@ read_netlink_messages (GSocket *socket, gssize len; gint flags; GError *error = NULL; - GSocketAddress *addr; + GSocketAddress *addr = NULL; struct nlmsghdr *msg; struct rtmsg *rtmsg; struct rtattr *attr; @@ -326,6 +326,7 @@ read_netlink_messages (GSocket *socket, if (len < 0) { g_warning ("Error on netlink socket: %s", error->message); + g_clear_object (&addr); g_error_free (error); if (nl->priv->dump_networks) finish_dump (nl); @@ -335,6 +336,7 @@ read_netlink_messages (GSocket *socket, if (!g_socket_address_to_native (addr, &source_sockaddr, sizeof (source_sockaddr), &error)) { g_warning ("Error on netlink socket: %s", error->message); + g_clear_object (&addr); g_error_free (error); if (nl->priv->dump_networks) finish_dump (nl); @@ -425,6 +427,7 @@ read_netlink_messages (GSocket *socket, done: g_free (iv.buffer); + g_clear_object (&addr); if (!retval && nl->priv->dump_networks) finish_dump (nl); |