diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-17 10:50:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-17 10:50:48 -0400 |
| commit | 32d9cea2892f79d8f16adcc5ae417980af33f082 (patch) | |
| tree | 98db1c92c70225c5604d7a994f6a217908c47f37 | |
| parent | 5511d21d2b99fb686f3ad57be1a16d383f77adc9 (diff) | |
| parent | 414adb237bc51e0e1b7321364dd73d9b3e635733 (diff) | |
| download | tor-32d9cea2892f79d8f16adcc5ae417980af33f082.tar.gz tor-32d9cea2892f79d8f16adcc5ae417980af33f082.zip | |
Merge remote-tracking branch 'public/bug6853'
| -rw-r--r-- | changes/bug6853 | 3 | ||||
| -rw-r--r-- | src/or/routerparse.c | 2 |
2 files changed, 4 insertions, 1 deletions
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 43a95e88c1..8502ff2bf6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2101,7 +2101,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])); |