summaryrefslogtreecommitdiff
path: root/src/common/sandbox.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-07 10:52:12 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-07 10:52:12 -0500
commitd6ca36defa25e0d77718731924195cc244a18b11 (patch)
treee21612be111aeba9c589857f881e4ccb8bbcfdf4 /src/common/sandbox.c
parent30f05167f1b1dd26427a80db6494842f40049cb7 (diff)
parent045a50e45a74b9e403a320e4d3590a8eb0793d09 (diff)
downloadtor-d6ca36defa25e0d77718731924195cc244a18b11.tar.gz
tor-d6ca36defa25e0d77718731924195cc244a18b11.zip
Merge branch 'bug20710_025' into maint-0.2.9
Diffstat (limited to 'src/common/sandbox.c')
-rw-r--r--src/common/sandbox.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 24ba8a2997..ebc843e130 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1579,13 +1579,14 @@ sandbox_add_addrinfo(const char *name)
void
sandbox_free_getaddrinfo_cache(void)
{
- cached_getaddrinfo_item_t **next, **item;
+ cached_getaddrinfo_item_t **next, **item, *this;
for (item = HT_START(getaddrinfo_cache, &getaddrinfo_cache);
item;
item = next) {
+ this = *item;
next = HT_NEXT_RMV(getaddrinfo_cache, &getaddrinfo_cache, item);
- cached_getaddrinfo_item_free(*item);
+ cached_getaddrinfo_item_free(this);
}
HT_CLEAR(getaddrinfo_cache, &getaddrinfo_cache);