summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-05 12:02:15 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-05 12:02:15 -0400
commitd75be189df970f0da3a59f649e3be9c5d57868c6 (patch)
tree8f779c6dc6d6ba629d71272a4718be61d1884b13 /src
parentec61ae59a5d009a9e80f3bfa9a2aa5f5dfa05551 (diff)
parent33fcc0f61d1feb2fbdf3153c7c64780dcdce6767 (diff)
downloadtor-d75be189df970f0da3a59f649e3be9c5d57868c6.tar.gz
tor-d75be189df970f0da3a59f649e3be9c5d57868c6.zip
Merge branch 'maint-0.2.8' into maint-0.2.9
Diffstat (limited to 'src')
-rw-r--r--src/or/geoip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c
index ba65dfe56c..00c055bbe7 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -162,6 +162,7 @@ geoip_parse_entry(const char *line, sa_family_t family)
if (*line == '#')
return 0;
+ char buf[512];
if (family == AF_INET) {
unsigned int low, high;
if (tor_sscanf(line,"%u,%u,%2s", &low, &high, c) == 3 ||
@@ -172,7 +173,6 @@ geoip_parse_entry(const char *line, sa_family_t family)
goto fail;
country = c;
} else { /* AF_INET6 */
- char buf[512];
char *low_str, *high_str;
struct in6_addr low, high;
char *strtok_state;