mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

compact() didn't recompute the offsets table even though offsets might have

Browse Source 
changed.
As soon as a bitstring that didn't need compaction was encountered, compact()
would stop instead of processing the entire string.
This commit is contained in:
Bob Halley 1999-03-02 19:55:17 +00:00
parent 8301652f71
commit ed7f35a9f7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dns/name.c
View File

@ -1550,7 +1550,7 @@ compact(dns_name_t *name, unsigned char *offsets) {
n--; n--;
curr = &name->ndata[offsets[n]]; curr = &name->ndata[offsets[n]];
if (curr[0] != DNS_LABELTYPE_BITSTRING) if (curr[0] != DNS_LABELTYPE_BITSTRING)
break; continue;
/* /*
* We have consecutive bitstrings labels, and * We have consecutive bitstrings labels, and
* the more significant label ('head') has * the more significant label ('head') has
@ -1657,6 +1657,11 @@ compact(dns_name_t *name, unsigned char *offsets) {
while (head != last) while (head != last)
*curr++ = *head++; *curr++ = *head++;
name->length = (curr - name->ndata); name->length = (curr - name->ndata);
/*
* The offsets table may now be invalid.
*/
set_offsets(name, offsets, ISC_FALSE,
ISC_FALSE, ISC_FALSE);
goto again; goto again;
} }
} }
@ -2058,7 +2063,6 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name,
unsigned int nrem; unsigned int nrem;
unsigned int labels; unsigned int labels;
unsigned int count; unsigned int count;
isc_boolean_t absolute = ISC_FALSE;
dns_name_t tmp_name; dns_name_t tmp_name;
REQUIRE(VALID_NAME(prefix)); REQUIRE(VALID_NAME(prefix));