Merge pull request #1711 from mustrumr/network-use-after-free

network: fix use-after-free in link_free
2015-11-02 10:17:24 +01:00
parent ec8c6b19da 4701725cd5
commit fba397e2af
1 changed files with 3 additions and 3 deletions
@@ -349,12 +349,12 @@ static void link_free(Link *link) {
        while (!set_isempty(link->addresses))
                address_free(set_first(link->addresses));

-        set_free(link->addresses);
-
        while (!set_isempty(link->addresses_foreign))
                address_free(set_first(link->addresses_foreign));

-        set_free(link->addresses_foreign);
+        link->addresses = set_free(link->addresses);
+
+        link->addresses_foreign = set_free(link->addresses_foreign);

        while ((address = link->pool_addresses)) {
                LIST_REMOVE(addresses, link->pool_addresses, address);