From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 28 Oct 2020 09:09:51 +0000 (+0900)
Subject: network: make address_drop() accept NULL
X-Git-Tag: v248-rc1~514^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17959%2Fhead;p=thirdparty%2Fsystemd.git

network: make address_drop() accept NULL
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index b60d0d2d367..3ec47e30a34 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -405,7 +405,8 @@ static int address_drop(Address *address) {
         bool ready;
         int r;
 
-        assert(address);
+        if (!address)
+                return 0;
 
         ready = address_is_ready(address);
         link = address->link;
@@ -1245,8 +1246,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
 
         case RTM_DELADDR:
                 log_address_debug(tmp, address ? "Forgetting" : "Kernel removed unknown", link);
-                if (address)
-                        (void) address_drop(address);
+                (void) address_drop(address);
 
                 break;