aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2017-05-24 23:23:12 -0400
committerRoger Dingledine <arma@torproject.org>2017-05-24 23:37:00 -0400
commitd22d565331c7f8e02abb7720afd447c6b8760f21 (patch)
tree803b5e6f826d3cbe092851833b1943d16124e27f /src/or/router.c
parenta7e75ff7966d7d3d83d41a47c5b9fa5e3daa2465 (diff)
downloadtor-d22d565331c7f8e02abb7720afd447c6b8760f21.tar.gz
tor-d22d565331c7f8e02abb7720afd447c6b8760f21.zip
add copy of MyFamily element to the descriptor, not the element itself
If we add the element itself, we will later free it when we free the descriptor, and the next time we go to look at MyFamily, things will go badly. Fixes the rest of bug 22368; bugfix on 0.3.1.1-alpha.
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index b43742aa83..f2741b70af 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2308,7 +2308,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e)
smartlist_add_strdup(warned_nonexistent_family, name);
}
if (is_legal) {
- smartlist_add(ri->declared_family, name);
+ smartlist_add_strdup(ri->declared_family, name);
name = NULL;
}
} else if (router_digest_is_me(member->identity)) {