Fix a bridge segfault

When we enabled support to change statistic options without restarting
Tor we forgot to initialize geoip_countries. Fix that.

diff --git a/changes/bug1964 b/changes/bug1964
new file mode 100644 (file)
index 0000000..d100094
--- /dev/null
+++ b/changes/bug1964
@@ -0,0 +1,3 @@
+  o Major bugfixes:
+    - Fix a segfault that can happen when using bridges. Fixes bug 1964;
+      bugfix on 0.2.2.15-alpha.

diff --git a/src/or/geoip.c b/src/or/geoip.c
index 7f1052e98d17b2d64ce6d3f2b2a47086a03f95bd..ee8d72ee1def05e69cfeb6a21d73fa707881cd71 100644 (file)
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -254,6 +254,8 @@ geoip_get_country_by_ip(uint32_t ipaddr)
 int
 geoip_get_n_countries(void)
 {
+  if (!geoip_countries)
+    init_geoip_countries();
   return (int) smartlist_len(geoip_countries);
 }