sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bug9337' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2013-07-26 15:41:35 +02:00
parent 1d2e8020b7 11f1b7d9df
commit 8d0fb3a434
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug9337 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (DNS):
- Avoid an assertion failure when processing DNS replies without the
answer types we expected. Fixes bug 9337; bugfix on 0.2.4.7-alpha.

8
src/or/dns.c
View File

@ -437,8 +437,8 @@ cached_resolve_add_answer(cached_resolve_t *resolve,
if (resolve->res_status_ipv4 != RES_STATUS_INFLIGHT)
return;
if (dns_result == DNS_ERR_NONE && answer_addr) {
tor_assert(tor_addr_family(answer_addr) == AF_INET);
if (dns_result == DNS_ERR_NONE && answer_addr &&
tor_addr_family(answer_addr) == AF_INET) {
resolve->result_ipv4.addr_ipv4 = tor_addr_to_ipv4h(answer_addr);
resolve->res_status_ipv4 = RES_STATUS_DONE_OK;
} else {
@ -450,8 +450,8 @@ cached_resolve_add_answer(cached_resolve_t *resolve,
if (resolve->res_status_ipv6 != RES_STATUS_INFLIGHT)
return;
if (dns_result == DNS_ERR_NONE && answer_addr) {
tor_assert(tor_addr_family(answer_addr) == AF_INET6);
if (dns_result == DNS_ERR_NONE && answer_addr &&
tor_addr_family(answer_addr) == AF_INET6) {
memcpy(&resolve->result_ipv6.addr_ipv6,
tor_addr_to_in6(answer_addr),
sizeof(struct in6_addr));