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

fix a memory leak on exit in routerlist.c

Browse Source 
svn:r5169
This commit is contained in:
Nick Mathewson 2005-09-30 21:04:52 +00:00
parent de198d800b
commit 8408006318
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/or/routerlist.c
View File

@ -30,6 +30,7 @@ static void mark_all_trusteddirservers_up(void);
static int router_nickname_is_in_list(routerinfo_t *router, const char *list); static int router_nickname_is_in_list(routerinfo_t *router, const char *list);
static int router_nickname_matches(routerinfo_t *router, const char *nickname); static int router_nickname_matches(routerinfo_t *router, const char *nickname);
static void routerstatus_list_update_from_networkstatus(time_t now); static void routerstatus_list_update_from_networkstatus(time_t now);
static void local_routerstatus_free(local_routerstatus_t *rs);
/****************************************************************************/ /****************************************************************************/
@ -1016,6 +1017,12 @@ routerlist_free_all(void)
smartlist_free(networkstatus_list); smartlist_free(networkstatus_list);
networkstatus_list = NULL; networkstatus_list = NULL;
} }
if (routerstatus_list) {
SMARTLIST_FOREACH(routerstatus_list, local_routerstatus_t *, rs,
local_routerstatus_free(rs));
smartlist_free(routerstatus_list);
routerstatus_list = NULL;
}
} }
/** Free all storage held by the routerstatus object <b>rs</b>. */ /** Free all storage held by the routerstatus object <b>rs</b>. */
@ -1025,6 +1032,13 @@ routerstatus_free(routerstatus_t *rs)
tor_free(rs); tor_free(rs);
} }
/** Free all storage held by the local_routerstatus object <b>rs</b>. */
static void
local_routerstatus_free(local_routerstatus_t *rs)
{
tor_free(rs);
}
/** Free all storage held by the networkstatus object <b>ns</b>. */ /** Free all storage held by the networkstatus object <b>ns</b>. */
void void
networkstatus_free(networkstatus_t *ns) networkstatus_free(networkstatus_t *ns)
@ -2293,8 +2307,8 @@ routerstatus_list_update_from_networkstatus(time_t now)
rs_out->status.is_valid = n_valid > n_statuses/2; rs_out->status.is_valid = n_valid > n_statuses/2;
rs_out->status.is_running = n_running > n_recent/2; rs_out->status.is_running = n_running > n_recent/2;
} }
SMARTLIST_FOREACH(routerstatus_list, routerstatus_t *, rs, SMARTLIST_FOREACH(routerstatus_list, local_routerstatus_t *, rs,
routerstatus_free(rs)); local_routerstatus_free(rs));
smartlist_free(routerstatus_list); smartlist_free(routerstatus_list);
routerstatus_list = result; routerstatus_list = result;