diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-12-02 16:35:45 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-12-04 17:36:23 +0100 |
| commit | 60c330a2515494a88aaae948e0e1ddfac3e8c904 (patch) | |
| tree | e4044ee3a76123403eea172ce1d7379d35f498c0 | |
| parent | 682a85ff7c691f691f9f7745e34e396f15e5d601 (diff) | |
| download | tor-60c330a2515494a88aaae948e0e1ddfac3e8c904.tar.gz tor-60c330a2515494a88aaae948e0e1ddfac3e8c904.zip | |
cid 432: Remove dead code if we don't handle a consensus
Bugfix on 0.2.3.1, fixes the second half of bug 4637.
| -rw-r--r-- | changes/bug4637 | 3 | ||||
| -rw-r--r-- | src/or/directory.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug4637 b/changes/bug4637 new file mode 100644 index 0000000000..bf2ba932d2 --- /dev/null +++ b/changes/bug4637 @@ -0,0 +1,3 @@ + o Code simplifications and refactoring: + - Remove some dead code spotted by coverity. Fixes cid 432. + Bugfix on 0.2.3.1-alpha, closes bug 4637. diff --git a/src/or/directory.c b/src/or/directory.c index d4abe0243b..12636bac33 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -410,7 +410,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, } else { /* Otherwise it might be a consensus we don't parse, but which we * do cache. Look at the cached copy, perhaps. */ - cached_dir_t *cd = dirserv_get_consensus(resource ? resource : "ns"); + cached_dir_t *cd = dirserv_get_consensus(resource); if (cd) if_modified_since = cd->published + 180; } |