2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00

[master] [36737] allow zero-length URI and CAA fields

3914.	[bug]		Allow the URI target and CAA value fields to
			be zero length. [RT #36737]
This commit is contained in:
Evan Hunt
2014-08-06 17:40:14 -07:00
parent 1e7501fe07
commit cfe32752a6
9 changed files with 54 additions and 98 deletions

View File

@@ -131,9 +131,6 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target);
static isc_result_t
multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target);
static isc_result_t
multitxt_fromwire(isc_buffer_t *source, isc_buffer_t *target);
static isc_boolean_t
name_prefix(dns_name_t *name, dns_name_t *origin, dns_name_t *target);
@@ -1407,35 +1404,6 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) {
return (ISC_R_SUCCESS);
}
static isc_result_t
multitxt_fromwire(isc_buffer_t *source, isc_buffer_t *target) {
unsigned int n;
isc_region_t sregion;
isc_region_t tregion;
isc_buffer_activeregion(source, &sregion);
if (sregion.length == 0)
return(ISC_R_UNEXPECTEDEND);
n = 256U;
do {
if (n != 256U)
return (DNS_R_SYNTAX);
n = sregion.length;
isc_buffer_availableregion(target, &tregion);
if (n > tregion.length)
return (ISC_R_NOSPACE);
if (tregion.base != sregion.base)
memmove(tregion.base, sregion.base, n);
isc_buffer_forward(source, n);
isc_buffer_add(target, n);
isc_buffer_activeregion(source, &sregion);
} while (sregion.length != 0);
return (ISC_R_SUCCESS);
}
static isc_boolean_t
name_prefix(dns_name_t *name, dns_name_t *origin, dns_name_t *target) {
int l1, l2;