mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

fromtext_nxt(): check the range of 'dns_rdatatype_t covered' from the long int

Browse Source 
that is read via strtol() rather than assigning covered directly from strtol(),
so that a value greater than the width of dns_rdatatype_t can be detected.
This commit is contained in:
David Lawrence
1999-10-08 21:26:42 +00:00
parent 722cc17289
commit 6e482e595d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/dns/rdata/generic/nxt_30.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: nxt_30.c,v 1.16 1999/09/15 23:03:31 explorer Exp $ */ /* $Id: nxt_30.c,v 1.17 1999/10/08 21:26:42 tale Exp $ */
/* RFC 2065 */ /* RFC 2065 */
@@ -35,7 +35,7 @@ fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
dns_rdatatype_t covered; dns_rdatatype_t covered;
dns_rdatatype_t maxcovered = 0; dns_rdatatype_t maxcovered = 0;
isc_boolean_t first = ISC_TRUE; isc_boolean_t first = ISC_TRUE;
unsigned int n; long n;
REQUIRE(type == 30); REQUIRE(type == 30);
@@ -55,7 +55,10 @@ fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
ISC_TRUE)); ISC_TRUE));
if (token.type != isc_tokentype_string) if (token.type != isc_tokentype_string)
break; break;
covered = strtol(token.value.as_pointer, &e, 10); n = strtol(token.value.as_pointer, &e, 10);
if (n < 0 || n > 65535)
return (DNS_R_RANGE);
covered = (dns_rdatatype_t)n;
if (*e == 0) if (*e == 0)
(void) NULL; (void) NULL;
else if (dns_rdatatype_fromtext(&covered, else if (dns_rdatatype_fromtext(&covered,
@@ -100,9 +103,10 @@ totext_nxt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
for (i = 0 ; i < sr.length ; i++) { for (i = 0 ; i < sr.length ; i++) {
if (sr.base[i] != 0) if (sr.base[i] != 0)
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
if ((sr.base[i] & (0x80>>j)) != 0) { if ((sr.base[i] & (0x80 >> j)) != 0) {
result = dns_rdatatype_totext( result = dns_rdatatype_totext(
i * 8 + j, target); (dns_rdatatype_t)(i * 8 + j),
target);
if (result == DNS_R_SUCCESS) { if (result == DNS_R_SUCCESS) {
RETERR(str_totext(" ", RETERR(str_totext(" ",
target)); target));