moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

- Larry Lansing fixed ares_parse_srv_reply to properly parse replies 

which might contain non-SRV answers, skipping over potential non-SRV
  ones such as CNAMEs.
This commit is contained in:
Yang Tse 2009-11-26 01:21:21 +00:00
parent 19f79e5a79
commit 8b49428298
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ares/CHANGES
View File

@ -1,5 +1,10 @@
Changelog for the c-ares project Changelog for the c-ares project
* November 26, 2009 (Yang Tse)
- Larry Lansing fixed ares_parse_srv_reply to properly parse replies
which might contain non-SRV answers, skipping over potential non-SRV
ones such as CNAMEs.
* November 23, 2009 (Yang Tse) * November 23, 2009 (Yang Tse)
- Changed naming convention for c-ares libraries built with MSVC, details - Changed naming convention for c-ares libraries built with MSVC, details
and build instructions provided in README.msvc file. and build instructions provided in README.msvc file.

2
ares/RELEASE-NOTES
View File

@ -31,6 +31,6 @@ Fixed:
Thanks go to these friendly people for their efforts and contributions: Thanks go to these friendly people for their efforts and contributions:
Phil Blundell, Japheth Cleaver, Yang Tse, Gregor Jasny, Joshua Kwan, Phil Blundell, Japheth Cleaver, Yang Tse, Gregor Jasny, Joshua Kwan,
Timo Teras, Jakub Hrozek, John Engelhart Timo Teras, Jakub Hrozek, John Engelhart, Larry Lansing
Have fun! Have fun!

23
ares/ares_parse_srv_reply.c
View File

@ -56,7 +56,7 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
struct ares_srv_reply **srv_out) struct ares_srv_reply **srv_out)
{ {
unsigned int qdcount, ancount, i; unsigned int qdcount, ancount, i;
const unsigned char *aptr; const unsigned char *aptr, *vptr;
int status, rr_type, rr_class, rr_len; int status, rr_type, rr_class, rr_len;
long len; long len;
char *hostname = NULL, *rr_name = NULL; char *hostname = NULL, *rr_name = NULL;
@ -139,24 +139,25 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen,
} }
srv_last = srv_curr; srv_last = srv_curr;
srv_curr->priority = ntohs (*((unsigned short *)aptr)); vptr = aptr;
aptr += sizeof(unsigned short); srv_curr->priority = ntohs (*((unsigned short *)vptr));
srv_curr->weight = ntohs (*((unsigned short *)aptr)); vptr += sizeof(unsigned short);
aptr += sizeof(unsigned short); srv_curr->weight = ntohs (*((unsigned short *)vptr));
srv_curr->port = ntohs (*((unsigned short *)aptr)); vptr += sizeof(unsigned short);
aptr += sizeof(unsigned short); srv_curr->port = ntohs (*((unsigned short *)vptr));
vptr += sizeof(unsigned short);
status = ares_expand_name (aptr, abuf, alen, &srv_curr->host, &len); status = ares_expand_name (vptr, abuf, alen, &srv_curr->host, &len);
if (status != ARES_SUCCESS) if (status != ARES_SUCCESS)
break; break;
/* Move on to the next record */
aptr += len;
} }
/* Don't lose memory in the next iteration */ /* Don't lose memory in the next iteration */
free (rr_name); free (rr_name);
rr_name = NULL; rr_name = NULL;
/* Move on to the next record */
aptr += rr_len;
} }
if (hostname) if (hostname)

6
ares/ares_parse_txt_reply.c
View File

@ -172,14 +172,14 @@ ares_parse_txt_reply (const unsigned char *abuf, int alen,
} }
/* Make sure we NULL-terminate */ /* Make sure we NULL-terminate */
*((char *) txt_curr->txt + txt_curr->length) = '\0'; *((char *) txt_curr->txt + txt_curr->length) = '\0';
/* Move on to the next record */
aptr += rr_len;
} }
/* Don't lose memory in the next iteration */ /* Don't lose memory in the next iteration */
free (rr_name); free (rr_name);
rr_name = NULL; rr_name = NULL;
/* Move on to the next record */
aptr += rr_len;
} }
if (hostname) if (hostname)