diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:07:13 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:07:13 -0400 |
commit | d3ecb3a8d6d55575d4ab3f80fed5e2b2fdcc561a (patch) | |
tree | e6aff7c3efea37955c7bd7555aa4a5f5ac53de70 /src/test/test_hs_common.c | |
parent | f6b30a97a96837e012b296a43cc99018d96bcf13 (diff) | |
parent | 92b4996b233a6a5d034b4ecc47b9f97985bb5886 (diff) | |
download | tor-d3ecb3a8d6d55575d4ab3f80fed5e2b2fdcc561a.tar.gz tor-d3ecb3a8d6d55575d4ab3f80fed5e2b2fdcc561a.zip |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/test/test_hs_common.c')
-rw-r--r-- | src/test/test_hs_common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 8bcb2c7e46..7348eb746c 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -286,6 +286,7 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); uint8_t identity[DIGEST_LEN]; tor_addr_t ipv4_addr; + node_t *node = NULL; memset(identity, identity_idx, sizeof(identity)); @@ -304,7 +305,8 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, memset(&ri->cache_info.signing_key_cert->signing_key, identity_idx, ED25519_PUBKEY_LEN); tt_assert(nodelist_set_routerinfo(ri, NULL)); - node_t *node = node_get_mutable_by_id(ri->cache_info.identity_digest); + + node = node_get_mutable_by_id(ri->cache_info.identity_digest); tt_assert(node); node->rs = rs; /* We need this to exist for node_has_preferred_descriptor() to return @@ -317,6 +319,9 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, smartlist_add(ns->routerstatus_list, rs); done: + if (node == NULL) + routerstatus_free(rs); + routerinfo_free(ri); } |