From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 17 Sep 2012 14:24:52 +0000 (-0400)
Subject: Parse votes with >31 flags correctly
X-Git-Tag: tor-0.2.4.3-alpha~24^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=414adb237bc51e0e1b7321364dd73d9b3e635733;p=thirdparty%2Ftor.git

Parse votes with >31 flags correctly

We were doing (1<<p) to generate a flag at position p, but we should
have been doing (U64_LITERAL(1)<<p).

Fixes bug 6861; bugfix on 0.2.0.3-alpha; reported pseudonymously.
---

diff --git a/changes/bug6853 b/changes/bug6853
new file mode 100644
index 0000000000..382adfb44f
--- /dev/null
+++ b/changes/bug6853
@@ -0,0 +1,3 @@
+  o Minor bugfixes (directory authority):
+    - Correctly handle votes with more than 31 flags. Fixes bug 6853;
+      bugfix on 0.2.0.3-alpha.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 2bf072b3cf..022add393f 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2067,7 +2067,7 @@ routerstatus_parse_entry_from_string(memarea_t *area,
     for (i=0; i < tok->n_args; ++i) {
       int p = smartlist_string_pos(vote->known_flags, tok->args[i]);
       if (p >= 0) {
-        vote_rs->flags |= (1<<p);
+        vote_rs->flags |= (U64_LITERAL(1)<<p);
       } else {
         log_warn(LD_DIR, "Flags line had a flag %s not listed in known_flags.",
                  escaped(tok->args[i]));