From: Tom Gundersen <teg@jklm.no>
Date: Tue, 1 Jul 2014 08:28:36 +0000 (+0200)
Subject: networkd: link - drop assert from _free()
X-Git-Tag: v215~76
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=28aeb07f55ddf338c8705c002bde391cebbdc5a3;ds=inline

networkd: link - drop assert from _free()

_free() should always succeed, even if object is not fully allocated.
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index c99cafc24..8674eee94 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -106,8 +106,6 @@ static void link_free(Link *link) {
         if (!link)
                 return;
 
-        assert(link->manager);
-
         while ((address = link->addresses)) {
                 LIST_REMOVE(addresses, link->addresses, address);
                 address_free(address);
@@ -128,7 +126,8 @@ static void link_free(Link *link) {
         sd_dhcp6_client_unref(link->dhcp6_client);
         sd_icmp6_nd_unref(link->icmp6_router_discovery);
 
-        hashmap_remove(link->manager->links, &link->ifindex);
+        if (link->manager)
+                hashmap_remove(link->manager->links, &link->ifindex);
 
         free(link->ifname);