From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 7 Dec 2022 13:48:14 +0000 (+0900)
Subject: resolve: make etc_hosts_item_by_{address,name}_free() accept NULL
X-Git-Tag: v253-rc1~303^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb5c77305e53712aa5b039901c549266e7f2db11;p=thirdparty%2Fsystemd.git

resolve: make etc_hosts_item_by_{address,name}_free() accept NULL
---

diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c
index a87989d1a38..48d5f106e68 100644
--- a/src/resolve/resolved-etc-hosts.c
+++ b/src/resolve/resolved-etc-hosts.c
@@ -18,15 +18,21 @@
 /* Recheck /etc/hosts at most once every 2s */
 #define ETC_HOSTS_RECHECK_USEC (2*USEC_PER_SEC)
 
-static void etc_hosts_item_by_address_free(EtcHostsItemByAddress *item) {
+static EtcHostsItemByAddress *etc_hosts_item_by_address_free(EtcHostsItemByAddress *item) {
+        if (!item)
+                return NULL;
+
         strv_free(item->names);
-        free(item);
+        return mfree(item);
 }
 
-static void etc_hosts_item_by_name_free(EtcHostsItemByName *item) {
+static EtcHostsItemByName *etc_hosts_item_by_name_free(EtcHostsItemByName *item) {
+        if (!item)
+                return NULL;
+
         free(item->name);
         free(item->addresses);
-        free(item);
+        return mfree(item);
 }
 
 void etc_hosts_clear(EtcHosts *hosts) {
@@ -239,13 +245,8 @@ static void strip_localhost(EtcHosts *hosts) {
                 if (!in_order)
                         continue;
 
-                STRV_FOREACH(i, item->names) {
-                        EtcHostsItemByName *n;
-
-                        n = hashmap_remove(hosts->by_name, *i);
-                        if (n)
-                                etc_hosts_item_by_name_free(n);
-                }
+                STRV_FOREACH(i, item->names)
+                        etc_hosts_item_by_name_free(hashmap_remove(hosts->by_name, *i));
 
                 assert_se(hashmap_remove(hosts->by_address, local_in_addrs + j) == item);
                 etc_hosts_item_by_address_free(item);