From c951830002706719fd98f87dabd82437f3f392ac Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Mon, 27 Sep 2010 23:15:43 +0200 Subject: [PATCH] Fix a bridge segfault When we enabled support to change statistic options without restarting Tor we forgot to initialize geoip_countries. Fix that. --- changes/bug1964 | 3 +++ src/or/geoip.c | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 changes/bug1964 diff --git a/changes/bug1964 b/changes/bug1964 new file mode 100644 index 0000000000..d100094eba --- /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 7f1052e98d..ee8d72ee1d 100644 --- 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); }