diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2010-06-10 16:18:26 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2010-06-10 16:18:26 +0200 |
| commit | f7b40f45b733f3a9a483e764b742eb5b5148ce1a (patch) | |
| tree | 4eb3af5bc63f445911a0b6af738e2d1c4a4d6f40 | |
| parent | bedb59c03454f96cdd588e51b0661d4acc48dd28 (diff) | |
| download | tor-f7b40f45b733f3a9a483e764b742eb5b5148ce1a.tar.gz tor-f7b40f45b733f3a9a483e764b742eb5b5148ce1a.zip | |
Don't crash when reading cached*consensus files on startup
Fixes bug 1352
| -rw-r--r-- | changes/bug1532 | 4 | ||||
| -rw-r--r-- | src/or/dirserv.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug1532 b/changes/bug1532 new file mode 100644 index 0000000000..ed2690418b --- /dev/null +++ b/changes/bug1532 @@ -0,0 +1,4 @@ + o Major bugfixes + - Tor directory authorities no longer crash when started with a + cached-microdesc-consensus file in their data directory. Bugfix on + 0.2.2.6-alpha, fixes bug 1532. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8b215011f3..24b4d5483b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1597,6 +1597,8 @@ dirserv_get_runningrouters(void) cached_dir_t * dirserv_get_consensus(const char *flavor_name) { + if (!cached_consensuses) + return NULL; return strmap_get(cached_consensuses, flavor_name); } |