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

Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

This commit is contained in:
Nick Mathewson 2017-02-07 10:37:43 -05:00
parent c056d19323 0ca3f495c6
commit 2ce4330249
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug18710 Normal file
View File

@ -0,0 +1,6 @@
o Major bugfixes (DNS proxy):
- Stop a crash that could occur when a client running with DNSPort
received a query with multiple address types, where the first
address type was not supported. Found and fixed by Scott Dial.
Fixes bug 18710; bugfix on 0.2.5.4-alpha.

4
src/or/dnsserv.c
View File

@ -87,8 +87,6 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
for (i = 0; i < req->nquestions; ++i) { for (i = 0; i < req->nquestions; ++i) {
if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET) if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET)
continue; continue;
if (! q)
q = req->questions[i];
switch (req->questions[i]->type) { switch (req->questions[i]->type) {
case EVDNS_TYPE_A: case EVDNS_TYPE_A:
case EVDNS_TYPE_AAAA: case EVDNS_TYPE_AAAA:
@ -96,7 +94,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_)
/* We always pick the first one of these questions, if there is /* We always pick the first one of these questions, if there is
one. */ one. */
if (! supported_q) if (! supported_q)
supported_q = q; supported_q = req->questions[i];
break; break;
default: default:
break; break;