From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 11 Feb 2013 19:42:33 +0000 (-0500)
Subject: Fix a copy-and-paste issue found by coverity
X-Git-Tag: tor-0.2.4.11-alpha~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9432becbe0ff10788e8f289b6562720822b7ece;p=thirdparty%2Ftor.git

Fix a copy-and-paste issue found by coverity

Fixes CID 980650; bugfix on 0.2.4.10-alpha.
---

diff --git a/changes/cov980650 b/changes/cov980650
new file mode 100644
index 0000000000..cbbada2e66
--- /dev/null
+++ b/changes/cov980650
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix a copy-and-paste error when adding a missing A1 to a routerset
+      because of GeoIPExcludeUnknown. Fix for coverity CID 980650.
+      Bugfix on 0.2.4.10-alpha.
diff --git a/src/or/routerset.c b/src/or/routerset.c
index e45516bb6c..1eca5b6f6f 100644
--- a/src/or/routerset.c
+++ b/src/or/routerset.c
@@ -255,7 +255,7 @@ routerset_add_unknown_ccs(routerset_t **setp, int only_if_some_cc_set)
   }
   if (add_a1) {
     smartlist_add(set->country_names, tor_strdup("a1"));
-    smartlist_add(set->country_names, tor_strdup("{a1}"));
+    smartlist_add(set->list, tor_strdup("{a1}"));
   }
 
   if (add_unknown || add_a1) {