aboutsummaryrefslogtreecommitdiff
path: root/src/or/geoip.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-05 12:02:26 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-05 12:02:26 -0400
commit578a4392e94faaa85ae79dfe1d4e7e93d0700de5 (patch)
tree5610474f1c630b2e15bcee0efe3e621398c28fda /src/or/geoip.c
parent41ed9e978b77080c027e50ed831370efbeeeac37 (diff)
parentd75be189df970f0da3a59f649e3be9c5d57868c6 (diff)
downloadtor-578a4392e94faaa85ae79dfe1d4e7e93d0700de5.tar.gz
tor-578a4392e94faaa85ae79dfe1d4e7e93d0700de5.zip
Merge branch 'maint-0.2.9' into maint-0.3.0
Diffstat (limited to 'src/or/geoip.c')
-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 74811ea643..2f0047fa06 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;