Commit 1d7beea2 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'origin/maint-0.2.2'

parents 2a6d12c7 718252b2

changes/fmt_addr

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - When unable to format an address as a string, report its value

      as "???" rather than reusing the last formatted address. Bugfix

      on 0.2.1.5-alpha.

src/common/address.c

+4 −2
Original line number Diff line number Diff line
@@ -958,8 +958,10 @@ fmt_addr(const tor_addr_t *addr) 
{

  static char buf[TOR_ADDR_BUF_LEN];

  if (!addr) return "<null>";

  tor_addr_to_str(buf, addr, sizeof(buf), 0);

  if (tor_addr_to_str(buf, addr, sizeof(buf), 0))

    return buf;

  else

    return "???";

}



/** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4