diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-05 12:00:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-05 12:00:14 -0400 |
| commit | b104ea724dedebe49db299474abfd950ca0da0cb (patch) | |
| tree | daa0c5dc698d7b95ebc0cda4438e9e2275673c2f | |
| parent | 33b69e68847fd3cb7fd3a300633e5c4966afda6b (diff) | |
| parent | 1a540b579248c04eba79c3e18d022054b238f6f5 (diff) | |
| download | tor-b104ea724dedebe49db299474abfd950ca0da0cb.tar.gz tor-b104ea724dedebe49db299474abfd950ca0da0cb.zip | |
Merge branch 'maint-0.2.5' into release-0.2.5
| -rw-r--r-- | changes/bug22490 | 3 | ||||
| -rw-r--r-- | src/or/geoip.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug22490 b/changes/bug22490 new file mode 100644 index 0000000000..244dd50b36 --- /dev/null +++ b/changes/bug22490 @@ -0,0 +1,3 @@ + o Minor bugfixes (correctness): + - Avoid undefined behavior when parsing IPv6 entries from the geoip6 + file. Fixes bug 22490; bugfix on 0.2.4.6-alpha. diff --git a/src/or/geoip.c b/src/or/geoip.c index f722bac468..dbbeca030b 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -145,6 +145,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 || @@ -155,7 +156,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; |