]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: make address_drop() accept NULL 17959/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 28 Oct 2020 09:09:51 +0000 (18:09 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 14 Dec 2020 14:28:11 +0000 (23:28 +0900)
src/network/networkd-address.c

index b60d0d2d36770b94185a9d7a1302590b759e4310..3ec47e30a3412166d96fea6c39093ea406200e49 100644 (file)
@@ -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;