浏览代码

Avoid possible segfault when handling networkstatus vote with bad flavor

Fix for 6530; fix on 0.2.2.6-alpha.
Nick Mathewson 11 年之前
父节点
当前提交
57e35ad3d9
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 4 0
      changes/bug6530
  2. 1 1
      src/or/routerparse.c

+ 4 - 0
changes/bug6530

@@ -0,0 +1,4 @@
+  o Major bugfixes:
+    - Avoid a read of uninitializd RAM when reading a vote or consensus
+      document with an unrecognized flavor name.  Fixes bug 6530; bugfix on
+      0.2.2.6-alpha.

+ 1 - 1
src/or/routerparse.c

@@ -2821,7 +2821,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
     int flavor = networkstatus_parse_flavor_name(tok->args[1]);
     if (flavor < 0) {
       log_warn(LD_DIR, "Can't parse document with unknown flavor %s",
-               escaped(tok->args[2]));
+               escaped(tok->args[1]));
       goto err;
     }
     ns->flavor = flav = flavor;