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

Handle errors reported by fwrite() in dump_microdescriptor()

Browse Source 
Does not deal with error handling in dump_microdescriptor's callers.
This commit is contained in:
Peter Palfrader 2010-01-24 20:58:30 +01:00 committed by Nick Mathewson
parent 0552deb613
commit 256861023e
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/microdesc.c
View File

@ -59,7 +59,7 @@ HT_GENERATE(microdesc_map, microdesc_t, node,
static size_t static size_t
dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out)
{ {
size_t r = 0; size_t r = 0, written;
/* XXXX drops unkown annotations. */ /* XXXX drops unkown annotations. */
if (md->last_listed) { if (md->last_listed) {
char buf[ISO_TIME_LEN+1]; char buf[ISO_TIME_LEN+1];
@ -74,7 +74,13 @@ dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out)
} }
md->off = (off_t) ftell(f); md->off = (off_t) ftell(f);
fwrite(md->body, 1, md->bodylen, f); written = fwrite(md->body, 1, md->bodylen, f);
if (written != md->bodylen) {
log_warn(LD_DIR, "Couldn't dump microdescriptor (wrote %lu out of %lu): %s",
(unsigned long)written, (unsigned long)md->bodylen,
strerror(ferror(f)));
return(-1);
}
r += md->bodylen; r += md->bodylen;
return r; return r;
} }
@ -171,6 +177,11 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache,
if (f) { if (f) {
size_t annotation_len; size_t annotation_len;
size = dump_microdescriptor(f, md, &annotation_len); size = dump_microdescriptor(f, md, &annotation_len);
if (size < 0) {
/* XXX handle errors from dump_microdescriptor() */
/* log? return -1? die? coredump the universe? */
continue;
}
md->saved_location = SAVED_IN_JOURNAL; md->saved_location = SAVED_IN_JOURNAL;
cache->journal_len += size; cache->journal_len += size;
} else { } else {
@ -292,6 +303,11 @@ microdesc_cache_rebuild(microdesc_cache_t *cache)
continue; continue;
size = dump_microdescriptor(f, md, &annotation_len); size = dump_microdescriptor(f, md, &annotation_len);
if (size < 0) {
/* XXX handle errors from dump_microdescriptor() */
/* log? return -1? die? coredump the universe? */
continue;
}
md->off = off + annotation_len; md->off = off + annotation_len;
off += size; off += size;
if (md->saved_location != SAVED_IN_CACHE) { if (md->saved_location != SAVED_IN_CACHE) {