summaryrefslogtreecommitdiff
path: root/src/network/networkd-network.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-11-05 20:16:06 +0900
committerGitHub <noreply@github.com>2019-11-05 20:16:06 +0900
commitc631c3d6a340c13adf05dc9b06bd7bd566bd6c9e (patch)
tree06281db1403a7480cba2c1fdcaf8e47d0d41741a /src/network/networkd-network.c
parent09d0b46ab61bebafe5bdc1be95ee153dfb13d6bc (diff)
parent69d7eba1880095f4a9bf9350de777fe7d370c188 (diff)
downloadsystemd-c631c3d6a340c13adf05dc9b06bd7bd566bd6c9e.tar.gz
Merge pull request #13939 from yuwata/network-fix-memleak-and-13938
network: fix memleak and invalid free function
Diffstat (limited to 'src/network/networkd-network.c')
-rw-r--r--src/network/networkd-network.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 90d86f35a9..f6d02fb274 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -306,7 +306,7 @@ int network_verify(Network *network) {
LIST_FOREACH_SAFE(prefixes, prefix, prefix_next, network->static_route_prefixes)
if (section_is_invalid(prefix->section))
- prefix_free(prefix);
+ route_prefix_free(prefix);
LIST_FOREACH_SAFE(rules, rule, rule_next, network->rules)
if (routing_policy_rule_section_verify(rule) < 0)
@@ -654,6 +654,9 @@ static Network *network_free(Network *network) {
while ((prefix = network->static_prefixes))
prefix_free(prefix);
+ while ((prefix = network->static_route_prefixes))
+ route_prefix_free(prefix);
+
while ((rule = network->rules))
routing_policy_rule_free(rule);
@@ -664,6 +667,7 @@ static Network *network_free(Network *network) {
hashmap_free(network->neighbors_by_section);
hashmap_free(network->address_labels_by_section);
hashmap_free(network->prefixes_by_section);
+ hashmap_free(network->route_prefixes_by_section);
hashmap_free(network->rules_by_section);
ordered_hashmap_free_with_destructor(network->qdiscs_by_section, qdisc_free);