GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 3e4814ed authored by rl1987's avatar rl1987
Browse files

Fix some checks of tor_inet_ntoa() return value

Also, fix a format string.
parent 7a004fce
......@@ -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);
}
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment