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

Merge branch 'bug10423' into maint-0.2.4

Browse Source
This commit is contained in:
Nick Mathewson 2013-12-17 13:53:11 -05:00
commit 561d9880f8
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug10423 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- If we fail to dump a previously cached microdescriptor to disk, avoid
freeing duplicate data later on. Fix for bug 10423; bugfix on
0.2.4.13-alpha. Spotted by "bobnomnom".

33
src/or/microdesc.c
View File

@ -406,6 +406,26 @@ should_rebuild_md_cache(microdesc_cache_t *cache)
return 0; return 0;
} }
/**
* Mark <b>md</b> as having no body, and release any storage previously held
* by its body.
*/
static void
microdesc_wipe_body(microdesc_t *md)
{
if (!md)
return;
if (md->saved_location != SAVED_IN_CACHE)
tor_free(md->body);
md->off = 0;
md->saved_location = SAVED_NOWHERE;
md->body = NULL;
md->bodylen = 0;
md->no_save = 1;
}
/** Regenerate the main cache file for <b>cache</b>, clear the journal file, /** Regenerate the main cache file for <b>cache</b>, clear the journal file,
* and update every microdesc_t in the cache with pointers to its new * and update every microdesc_t in the cache with pointers to its new
* location. If <b>force</b> is true, do this unconditionally. If * location. If <b>force</b> is true, do this unconditionally. If
@ -454,12 +474,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force)
size = dump_microdescriptor(fd, md, &annotation_len); size = dump_microdescriptor(fd, md, &annotation_len);
if (size < 0) { if (size < 0) {
if (md->saved_location != SAVED_IN_CACHE) microdesc_wipe_body(md);
tor_free(md->body);
md->saved_location = SAVED_NOWHERE;
md->off = 0;
md->bodylen = 0;
md->no_save = 1;
/* rewind, in case it was a partial write. */ /* rewind, in case it was a partial write. */
tor_fd_setpos(fd, off); tor_fd_setpos(fd, off);
@ -496,11 +511,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force)
HT_FOREACH(mdp, microdesc_map, &cache->map) { HT_FOREACH(mdp, microdesc_map, &cache->map) {
microdesc_t *md = *mdp; microdesc_t *md = *mdp;
if (md->saved_location == SAVED_IN_CACHE) { if (md->saved_location == SAVED_IN_CACHE) {
md->off = 0; microdesc_wipe_body(md);
md->saved_location = SAVED_NOWHERE;
md->body = NULL;
md->bodylen = 0;
md->no_save = 1;
} }
} }
return -1; return -1;