Commit 62b239dd authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.8'

parents 3c8baa77 0ba05313

changes/bug19947

0 → 100644
+4 −0
Original line number Diff line number Diff line 
 o Minor bugfixes (fallback directories):

    - Avoid logging a NULL string pointer when loading fallback directory information.

      Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha.

      Report and patch by "rubiate".

src/or/routerlist.c

+2 −2
Original line number Diff line number Diff line
@@ -4544,10 +4544,10 @@ dir_server_new(int is_authority, 


  if (nickname)

    tor_asprintf(&ent->description, "directory server \"%s\" at %s:%d",

                 nickname, hostname, (int)dir_port);

                 nickname, hostname_, (int)dir_port);

  else

    tor_asprintf(&ent->description, "directory server at %s:%d",

                 hostname, (int)dir_port);

                 hostname_, (int)dir_port);



  ent->fake_status.addr = ent->addr;

  tor_addr_copy(&ent->fake_status.ipv6_addr, &ent->ipv6_addr);