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

r13023@Kushana: nickm | 2007-05-20 16:16:36 -0400

Browse Source 
More bulletproofing on bug 429


svn:r10231
This commit is contained in:
Nick Mathewson 2007-05-20 20:16:45 +00:00
parent 21a72520ce
commit a4f5b99e61
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/or/router.c
View File

@ -1031,6 +1031,7 @@ router_rebuild_descriptor(int force)
/* Now generate the extrainfo. */ /* Now generate the extrainfo. */
ei = tor_malloc_zero(sizeof(extrainfo_t)); ei = tor_malloc_zero(sizeof(extrainfo_t));
ei->cache_info.is_extrainfo = 1;
strlcpy(ei->nickname, get_options()->Nickname, sizeof(ei->nickname)); strlcpy(ei->nickname, get_options()->Nickname, sizeof(ei->nickname));
ei->cache_info.published_on = ri->cache_info.published_on; ei->cache_info.published_on = ri->cache_info.published_on;
memcpy(ei->cache_info.identity_digest, ri->cache_info.identity_digest, memcpy(ei->cache_info.identity_digest, ri->cache_info.identity_digest,

6
src/or/routerlist.c
View File

@ -1798,6 +1798,12 @@ extrainfo_insert(routerlist_t *rl, extrainfo_t *ei)
extrainfo_t *ei_tmp; extrainfo_t *ei_tmp;
routerlist_check_bug_417(); routerlist_check_bug_417();
{
/* XXXX020 remove this code once bug 417/404 is fixed. */
extrainfo_t *ei_generated = router_get_my_extrainfo();
tor_assert(ei_generated != ei);
}
if (!ri) { if (!ri) {
/* This router is unknown; we can't even verify the signature. Give up.*/ /* This router is unknown; we can't even verify the signature. Give up.*/
goto done; goto done;