Commit 33fcc0f6 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

parents 5b45d732 3f2d1f7f

changes/bug22490

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/or/geoip.c

+1 −1
Original line number Diff line number Diff line
@@ -144,6 +144,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 ||
@@ -154,7 +155,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;