From 8b494282989bf34dc8596a9b2338afa58e1eb68b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 26 Nov 2009 01:21:21 +0000 Subject: - 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. --- ares/ares_parse_srv_reply.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'ares/ares_parse_srv_reply.c') diff --git a/ares/ares_parse_srv_reply.c b/ares/ares_parse_srv_reply.c index 2e5095e04..de723f393 100644 --- a/ares/ares_parse_srv_reply.c +++ b/ares/ares_parse_srv_reply.c @@ -56,7 +56,7 @@ ares_parse_srv_reply (const unsigned char *abuf, int alen, struct ares_srv_reply **srv_out) { unsigned int qdcount, ancount, i; - const unsigned char *aptr; + const unsigned char *aptr, *vptr; int status, rr_type, rr_class, rr_len; long len; 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_curr->priority = ntohs (*((unsigned short *)aptr)); - aptr += sizeof(unsigned short); - srv_curr->weight = ntohs (*((unsigned short *)aptr)); - aptr += sizeof(unsigned short); - srv_curr->port = ntohs (*((unsigned short *)aptr)); - aptr += sizeof(unsigned short); + vptr = aptr; + srv_curr->priority = ntohs (*((unsigned short *)vptr)); + vptr += sizeof(unsigned short); + srv_curr->weight = ntohs (*((unsigned short *)vptr)); + vptr += 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) break; - - /* Move on to the next record */ - aptr += len; } /* Don't lose memory in the next iteration */ free (rr_name); rr_name = NULL; + + /* Move on to the next record */ + aptr += rr_len; } if (hostname) -- cgit v1.2.3