mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Check for possible failures of tor_inet_ntop/tor_inet_ntoa in fmt_addr32 and tor_dup_ip

Browse source
This commit is contained in:
rl1987 2020-04-08 18:33:18 +03:00 • committed by rl1987
parent b5bfdbfd41
commit d8e24684b6
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/lib/net/address.c
View file

@ -1196,14 +1196,24 @@ fmt_addrport(const tor_addr_t *addr, uint16_t port)
/** 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
* addresses. Also not thread-safe, also clobbers its return buffer on * addresses. Also not thread-safe, also clobbers its return buffer on
* repeated calls. */ * repeated calls. Clean internal buffer and return empty string on failure. */
const char * const char *
fmt_addr32(uint32_t addr) fmt_addr32(uint32_t addr)
{ {
static char buf[INET_NTOA_BUF_LEN]; static char buf[INET_NTOA_BUF_LEN];
struct in_addr in; struct in_addr in;
int success;
in.s_addr = htonl(addr); in.s_addr = htonl(addr);
tor_inet_ntoa(&in, buf, sizeof(buf));
success = tor_inet_ntoa(&in, buf, sizeof(buf));
tor_assertf_nonfatal(success > 0,
"Failed to convert IP %04X to string", addr);
if (success <= 0) {
memset(buf, 0, INET_NTOA_BUF_LEN);
}
return buf; return buf;
} }
@ -1995,17 +2005,24 @@ parse_port_range(const char *port, uint16_t *port_min_out,
} }
/** Given a host-order <b>addr</b>, call tor_inet_ntop() on it /** Given a host-order <b>addr</b>, call tor_inet_ntop() on it
* and return a strdup of the resulting address. * and return a strdup of the resulting address. Return NULL if
* tor_inet_ntop() fails.
*/ */
char * char *
tor_dup_ip(uint32_t addr) tor_dup_ip(uint32_t addr)
{ {
const char *ip_str;
char buf[TOR_ADDR_BUF_LEN]; char buf[TOR_ADDR_BUF_LEN];
struct in_addr in; struct in_addr in;
in.s_addr = htonl(addr); in.s_addr = htonl(addr);
tor_inet_ntop(AF_INET, &in, buf, sizeof(buf)); ip_str = tor_inet_ntop(AF_INET, &in, buf, sizeof(buf));
tor_assertf_nonfatal(ip_str, "Failed to duplicate IP %04X", addr);
if (ip_str)
return tor_strdup(buf); return tor_strdup(buf);
return NULL;
} }
/** /**