From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 2 Nov 2010 15:49:58 +0000 (-0400)
Subject: Enforce multiplicity rules when parsing annotations.
X-Git-Tag: tor-0.2.2.18-alpha~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a50dd9359ec9bd113c64aa91cb5c2dd875de7dd;p=thirdparty%2Ftor.git

Enforce multiplicity rules when parsing annotations.

We would never actually enforce multiplicity rules when parsing
annotations, since the counts array never got entries added to it for
annotations in the token list that got added by earlier calls to
tokenize_string.

Found by piebeer.
---

diff --git a/changes/annotations_fix b/changes/annotations_fix
index d3cd7f343e..b259a306d2 100644
--- a/changes/annotations_fix
+++ b/changes/annotations_fix
@@ -4,5 +4,7 @@
       Previously we would ignore such annotations at first, but cache
       them to disk anyway.  Bugfix on 0.2.0.8-alpha. Found by piebeer.
 
-
+  o Minor bugfixes
+    - Enforce multiplicity rules when parsing annotations.  Bugfix on
+      0.2.0.8-alpha. Found by piebeer.
 
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index da08e46644..3d8ca14317 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3181,6 +3181,9 @@ tokenize_string(memarea_t *area,
     end = start+strlen(start);
   for (i = 0; i < _NIL; ++i)
     counts[i] = 0;
+
+  SMARTLIST_FOREACH(out, const directory_token_t *, t, ++counts[t->tp]);
+
   while (*s < end && (!tok || tok->tp != _EOF)) {
     tok = get_next_token(area, s, end, table);
     if (tok->tp == _ERR) {