[systemd-commits] src/network

[Tom Gundersen]

 src/network/networkd-link.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 28aeb07f55ddf338c8705c002bde391cebbdc5a3
Author: Tom Gundersen <teg at jklm.no>
Date:   Tue Jul 1 10:28:36 2014 +0200

    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 c99cafc..8674eee 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);