Merge remote branch 'sebastian/bug1964' into maint-0.2.2

2024-09-20 13:06:20 +02:00 · 2010-09-27 17:26:32 -04:00 · 2010-09-27 17:26:32 -04:00 · 614eeb378b
commit 614eeb378b
parent 7c83b0a2a2 c951830002
2 changed files with 5 additions and 0 deletions
--- a/changes/bug1964
+++ 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.
--- 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);
 }