瀏覽代碼

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.
Sebastian Hahn 12 年之前
父節點
當前提交
60c330a251
共有 2 個文件被更改,包括 4 次插入1 次删除
  1. 3 0
      changes/bug4637
  2. 1 1
      src/or/directory.c

+ 3 - 0
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.

+ 1 - 1
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;
     }