nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Freeing twice does *not* make the heap twice as clean.

Browse Source 
svn:r1027
This commit is contained in:
Nick Mathewson 2004-01-30 21:05:47 +00:00
parent 88b579dd33
commit e4ad1f1629
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/routerlist.c
View File

@ -783,6 +783,7 @@ routerinfo_t *router_get_entry_from_string(const char**s) {
log_fn(LOG_WARN, "Missing onion key"); goto err;
} /* XXX Check key length */
router->onion_pkey = tok->val.public_key;
tok->val.public_key = NULL; /* Prevent free */
NEXT_TOKEN();
if (tok->tp != K_LINK_KEY) {
@ -793,6 +794,7 @@ routerinfo_t *router_get_entry_from_string(const char**s) {
log_fn(LOG_WARN, "Missing link key"); goto err;
} /* XXX Check key length */
router->link_pkey = tok->val.public_key;
tok->val.public_key = NULL; /* Prevent free */
NEXT_TOKEN();
if (tok->tp != K_SIGNING_KEY) {
@ -803,6 +805,7 @@ routerinfo_t *router_get_entry_from_string(const char**s) {
log_fn(LOG_WARN, "Missing signing key"); goto err;
}
router->identity_pkey = tok->val.public_key;
tok->val.public_key = NULL; /* Prevent free */
NEXT_TOKEN();
while (tok->tp == K_ACCEPT || tok->tp == K_REJECT) {
@ -1037,10 +1040,12 @@ router_release_token(directory_token_t *tok)
switch (tok->tp)
{
case _SIGNATURE:
free(tok->val.signature);
if (tok->val.signature)
free(tok->val.signature);
break;
case _PUBLIC_KEY:
crypto_free_pk_env(tok->val.public_key);
if (tok->val.public_key)
crypto_free_pk_env(tok->val.public_key);
break;
case _ERR:
case _EOF: