diff options
| author | Peter Palfrader <peter@palfrader.org> | 2010-01-24 20:58:30 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-01-24 15:05:20 -0500 |
| commit | 256861023e18f760bb5497630e02f139d17301b4 (patch) | |
| tree | 46fc26ac9ef92abfb20d35218f7710f72189154a | |
| parent | 0552deb613ab9872462f10b07f490df60f8e1c22 (diff) | |
| download | tor-256861023e18f760bb5497630e02f139d17301b4.tar.gz tor-256861023e18f760bb5497630e02f139d17301b4.zip | |
Handle errors reported by fwrite() in dump_microdescriptor()
Does not deal with error handling in dump_microdescriptor's callers.
| -rw-r--r-- | src/or/microdesc.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index c1f447c5df..45e182befb 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -59,7 +59,7 @@ HT_GENERATE(microdesc_map, microdesc_t, node, static size_t 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. */ if (md->last_listed) { 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); - 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; return r; } @@ -171,6 +177,11 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, if (f) { size_t 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; cache->journal_len += size; } else { @@ -292,6 +303,11 @@ microdesc_cache_rebuild(microdesc_cache_t *cache) continue; 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; off += size; if (md->saved_location != SAVED_IN_CACHE) { |