nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2011-07-20 13:17:59 -04:00
commit 1d7beea2ab
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/fmt_addr Normal file
View File

@ -0,0 +1,4 @@
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.

6
src/common/address.c
View File

@ -958,8 +958,10 @@ fmt_addr(const tor_addr_t *addr)
{ {
static char buf[TOR_ADDR_BUF_LEN]; static char buf[TOR_ADDR_BUF_LEN];
if (!addr) return "<null>"; 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; return buf;
else
return "???";
} }
/** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4 /** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4