mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
Merge branch 'maint-0.2.4' into maint-0.2.5
This commit is contained in:
commit
1a540b5792
3
changes/bug22490
Normal file
3
changes/bug22490
Normal file
@ -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.
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user