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

Avoid use-after-free error in 20020 fix

Browse Source 
CID 1424328; found by coverity; bugfix on 93dbce4ddd98ca9a4ff2f;
bug not in any released Tor.
This commit is contained in:
Nick Mathewson 2017-11-30 11:44:15 -05:00
parent 1c7121be54
commit a1b0a0b9cd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/routerlist.c
View File

@ -5197,6 +5197,10 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote,
log_warn(LD_BUG, "Failed to re-parse a router.");
continue;
}
/* need to compute this now, since add_to_routerlist may free. */
char time_cert_expires[ISO_TIME_LEN+1];
format_iso_time(time_cert_expires, ri->cert_expiration_time);
r = router_add_to_routerlist(ri, &msg, 1, 0);
if (WRA_WAS_OUTDATED(r)) {
log_warn(LD_DIR, "Couldn't add re-parsed router: %s. This isn't "
@ -5205,12 +5209,10 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote,
msg?msg:"???");
if (r == ROUTER_CERTS_EXPIRED) {
char time_cons[ISO_TIME_LEN+1];
char time_cert[ISO_TIME_LEN+1];
format_iso_time(time_cons, consensus->valid_after);
format_iso_time(time_cert, ri->cert_expiration_time);
log_warn(LD_DIR, " (I'm looking at a consensus from %s; This "
"router's certificates began expiring at %s.)",
time_cons, time_cert);
time_cons, time_cert_expires);
}
}
} SMARTLIST_FOREACH_END(sd);