diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-12-05 11:56:03 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-12-05 11:56:03 -0500 |
| commit | 4f47db328048f4a59549ccda534c8d3f74f655aa (patch) | |
| tree | cfdfe0134d4ba68daf78e02b0409f57f75a38d12 | |
| parent | 15d99fe4eb0e969322f401bc5d5b497d5cfc9f71 (diff) | |
| parent | 60c330a2515494a88aaae948e0e1ddfac3e8c904 (diff) | |
| download | tor-4f47db328048f4a59549ccda534c8d3f74f655aa.tar.gz tor-4f47db328048f4a59549ccda534c8d3f74f655aa.zip | |
Merge remote-tracking branch 'sebastian/coverity'
| -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; } |