1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: backport b5135bbc from c-ares repo

Browse Source 
Original commit message:

    ares_parse_txt_reply: return a ares_txt_reply node for each sub-string

    Previously, the function would wrongly return all substrings merged into
    one.

fix #6931
This commit is contained in:
Fedor Indutny 2014-01-23 14:27:36 +04:00 committed by Timothy J Fontaine
parent 0ec3770767
commit 896e19330a
1 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
deps/cares/src/ares_parse_txt_reply.c vendored
View File

@ -54,7 +54,7 @@ int
ares_parse_txt_reply (const unsigned char *abuf, int alen, ares_parse_txt_reply (const unsigned char *abuf, int alen,
struct ares_txt_reply **txt_out) struct ares_txt_reply **txt_out)
{ {
size_t substr_len, str_len; size_t substr_len;
unsigned int qdcount, ancount, i; unsigned int qdcount, ancount, i;
const unsigned char *aptr; const unsigned char *aptr;
const unsigned char *strptr; const unsigned char *strptr;
@ -116,23 +116,6 @@ ares_parse_txt_reply (const unsigned char *abuf, int alen,
/* Check if we are really looking at a TXT record */ /* Check if we are really looking at a TXT record */
if (rr_class == C_IN && rr_type == T_TXT) if (rr_class == C_IN && rr_type == T_TXT)
{ {
/* Allocate storage for this TXT answer appending it to the list */
txt_curr = ares_malloc_data(ARES_DATATYPE_TXT_REPLY);
if (!txt_curr)
{
status = ARES_ENOMEM;
break;
}
if (txt_last)
{
txt_last->next = txt_curr;
}
else
{
txt_head = txt_curr;
}
txt_last = txt_curr;
/* /*
* There may be multiple substrings in a single TXT record. Each * There may be multiple substrings in a single TXT record. Each
* substring may be up to 255 characters in length, with a * substring may be up to 255 characters in length, with a
@ -141,36 +124,49 @@ ares_parse_txt_reply (const unsigned char *abuf, int alen,
* substrings contained therein. * substrings contained therein.
*/ */
/* Compute total length to allow a single memory allocation */
strptr = aptr; strptr = aptr;
while (strptr < (aptr + rr_len)) while (strptr < (aptr + rr_len))
{ {
substr_len = (unsigned char)*strptr; substr_len = (unsigned char)*strptr;
txt_curr->length += substr_len; if (strptr + substr_len + 1 > aptr + rr_len)
strptr += substr_len + 1; {
} status = ARES_EBADRESP;
break;
}
/* Including null byte */ ++strptr;
txt_curr->txt = malloc (txt_curr->length + 1);
if (txt_curr->txt == NULL) /* Allocate storage for this TXT answer appending it to the list */
{ txt_curr = ares_malloc_data(ARES_DATATYPE_TXT_REPLY);
status = ARES_ENOMEM; if (!txt_curr)
break; {
} status = ARES_ENOMEM;
break;
}
if (txt_last)
{
txt_last->next = txt_curr;
}
else
{
txt_head = txt_curr;
}
txt_last = txt_curr;
txt_curr->length = substr_len;
txt_curr->txt = malloc (substr_len + 1/* Including null byte */);
if (txt_curr->txt == NULL)
{
status = ARES_ENOMEM;
break;
}
memcpy ((char *) txt_curr->txt, strptr, substr_len);
/* Make sure we NULL-terminate */
txt_curr->txt[substr_len] = 0;
/* Step through the list of substrings, concatenating them */
str_len = 0;
strptr = aptr;
while (strptr < (aptr + rr_len))
{
substr_len = (unsigned char)*strptr;
strptr++;
memcpy ((char *) txt_curr->txt + str_len, strptr, substr_len);
str_len += substr_len;
strptr += substr_len; strptr += substr_len;
} }
/* Make sure we NULL-terminate */
*((char *) txt_curr->txt + txt_curr->length) = '\0';
} }
/* Don't lose memory in the next iteration */ /* Don't lose memory in the next iteration */