Merge pull request #5421 from ssahani/net7

networkd: Do not set config to NULL immediately.

src/network/networkd-address.c

@@ -85,7 +85,11 @@ int address_new_static(Network *network, const char *filename, unsigned section_
 
         if (filename) {
                 address->section = n;
-                hashmap_put(network->addresses_by_section, n, address);
+                n = NULL;
+
+                r = hashmap_put(network->addresses_by_section, address->section, address);
+                if (r < 0)
+                        return r;
         }
 
         address->network = network;
@@ -94,7 +98,6 @@ int address_new_static(Network *network, const char *filename, unsigned section_
 
         *ret = address;
         address = NULL;
-        n = NULL;
 
         return 0;
 }

src/network/networkd-route.c

@@ -113,7 +113,7 @@ int route_new_static(Network *network, const char *filename, unsigned section_li
                 route->section = n;
                 n = NULL;
 
-                r = hashmap_put(network->routes_by_section, n, route);
+                r = hashmap_put(network->routes_by_section, route->section, route);
                 if (r < 0)
                         return r;
         }