upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 01:49:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'marka-maybe_numeric-and-nul-v9_11' into 'v9_11'

Browse source 
maybe_numeric failed to handle NUL in text region.

See merge request isc-projects/bind9!1322
This commit is contained in:
Mark Andrews 2019-01-09 03:20:44 -05:00
commit aaab84019c
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
5127. [bug] rcode.c:maybe_numeric failed to handle NUL in text
regions. [GL #807]
5126. [bug] Named incorrectly accepted empty base64 and hex encoded
fields when reading master files. [GL #807]

20
lib/dns/rcode.c
View file

@ -244,28 +244,36 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source,
isc_result_t result;
uint32_t n;
char buffer[NUMBERSIZE];
int v;
if (! isdigit(source->base[0] & 0xff) ||
source->length > NUMBERSIZE - 1)
{
return (ISC_R_BADNUMBER);
}
/*
* We have a potential number. Try to parse it with
* isc_parse_uint32(). isc_parse_uint32() requires
* null termination, so we must make a copy.
*/
snprintf(buffer, sizeof(buffer), "%.*s",
(int)source->length, source->base);
v = snprintf(buffer, sizeof(buffer), "%.*s",
(int)source->length, source->base);
if (v < 0 || (unsigned)v != source->length) {
return (ISC_R_BADNUMBER);
}
INSIST(buffer[source->length] == '\0');
result = isc_parse_uint32(&n, buffer, 10);
if (result == ISC_R_BADNUMBER && hex_allowed)
if (result == ISC_R_BADNUMBER && hex_allowed) {
result = isc_parse_uint32(&n, buffer, 16);
if (result != ISC_R_SUCCESS)
}
if (result != ISC_R_SUCCESS) {
return (result);
if (n > max)
}
if (n > max) {
return (ISC_R_RANGE);
}
*valuep = n;
return (ISC_R_SUCCESS);
}