nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

r19074@catbus: nickm | 2008-03-26 17:08:32 -0400

Browse Source 
Start new address policies with refcount of 1, not 2.  Backport candidate once tested more.


svn:r14204
This commit is contained in:
Nick Mathewson 2008-03-26 21:08:39 +00:00
parent e9221f4a0d
commit 944bd3dbed
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -13,6 +13,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
Fixes the other part of bug 617. Bugfix on 0.2.0.1-alpha.
- Initialize log mutex before initializing dmalloc. Otherwise,
running with dmalloc would crash. Bugfix on 0.2.0.x-alpha.
- Keep address policies from leaking: start their refcount at 1, not
2. Bugfix on 0.2.0.16-alpha.
o Minor features:
- Allow separate log levels to be configured for different logging

2
src/or/policies.c
View File

@ -495,7 +495,7 @@ addr_policy_get_canonical_entry(addr_policy_t *e)
found = tor_malloc_zero(sizeof(policy_map_ent_t));
found->policy = tor_memdup(e, sizeof(addr_policy_t));
found->policy->is_canonical = 1;
found->policy->refcnt = 1;
found->policy->refcnt = 0;
HT_INSERT(policy_map, &policy_root, found);
}

14
src/or/routerparse.c
View File

@ -1652,18 +1652,20 @@ authority_cert_parse_from_string(const char *s, const char **end_of_string)
*end_of_string = eat_whitespace(eos);
}
SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
if (area)
memarea_drop_all(area);
smartlist_free(tokens);
return cert;
err:
authority_cert_free(cert);
SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
if (area) {
DUMP_AREA(area, "authority cert");
memarea_drop_all(area);
}
return cert;
err:
authority_cert_free(cert);
SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t));
smartlist_free(tokens);
if (area) {
DUMP_AREA(area, "authority cert");
memarea_drop_all(area);
}
return NULL;
}