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

Fix some checks of tor_inet_ntoa() return value

Browse Source 
Also, fix a format string.
This commit is contained in:
rl1987 2020-06-05 11:49:24 +03:00
parent 7a004fce8d
commit 3e4814edeb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/feature/relay/dns.c
View File

@ -1881,7 +1881,7 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl,
int ntoa_res;
in.s_addr = addrs[i];
ntoa_res = tor_inet_ntoa(&in, answer_buf, sizeof(answer_buf));
tor_assert_nonfatal(ntoa_res > 0);
tor_assert_nonfatal(ntoa_res >= 0);
if (ntoa_res > 0)
wildcard_increment_answer(answer_buf);
}

6
src/lib/net/address.c
View File

@ -1207,10 +1207,10 @@ fmt_addr32(uint32_t addr)
in.s_addr = htonl(addr);
success = tor_inet_ntoa(&in, buf, sizeof(buf));
tor_assertf_nonfatal(success > 0,
"Failed to convert IP %04X to string", addr);
tor_assertf_nonfatal(success >= 0,
"Failed to convert IP 0x%08X (HBO) to string", addr);
if (success <= 0) {
IF_BUG_ONCE(success < 0) {
memset(buf, 0, INET_NTOA_BUF_LEN);
}