mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

require an initialized name for dns_name_dup(); lint

Browse Source
This commit is contained in:
Bob Halley
1999-07-03 20:51:31 +00:00
parent c0de97d5db
commit 402b05ddea
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/dns/include/dns/name.h
View File

@@ -870,27 +870,17 @@ dns_name_split(dns_name_t *name,
*/
dns_result_t
dns_name_dup(dns_name_t *source, isc_mem_t *mctx, unsigned char *offsets,
dns_name_t *target);
dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target);
/*
* Make 'target' a dynamically allocated copy of 'source'.
*
* Notes:
*
* 'target' will be initialized.
*
* 'offsets' is never required to be non-NULL, but specifying a
* dns_offsets_t for 'offsets' will improve the performance of most
* name operations if the name is used more than once.
*
* Requires:
*
* 'source' is a valid non-empty name.
*
* 'target' is a valid name that is not read-only.
*
* 'mctx' is a valid memory context.
*
* offsets == NULL or offsets is a dns_offsets_t.
*
*/
void

19
lib/dns/name.c
View File

@@ -1323,13 +1323,13 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
*/
n1 = bitlength - 1 / 8;
n2 = tbcount - 1 / 8;
if (n1 != n2)
if (n1 != n2) {
if (value != 0)
return
(DNS_R_BADBITSTRING);
else
count = 0;
}
} else if (kind == ft_hex) {
/*
* Figure out correct number
@@ -2564,7 +2564,8 @@ dns_name_split(dns_name_t *name,
len = bitbytes;
if (mod == 0) {
if (name->ndata == prefix->buffer->base &&
if ((void *)(name->ndata) ==
prefix->buffer->base &&
len > (unsigned int)(src - dst))
memmove(dst, src, len);
else
@@ -2721,16 +2722,18 @@ dns_name_split(dns_name_t *name,
}
dns_result_t
dns_name_dup(dns_name_t *source, isc_mem_t *mctx, unsigned char *offsets,
dns_name_t *target) {
dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) {
REQUIRE(VALID_NAME(source));
REQUIRE(source->length > 0);
REQUIRE(VALID_NAME(target));
REQUIRE((target->attributes & DNS_NAMEATTR_READONLY) == 0);
/*
* Make 'target' a dynamically allocated copy of 'source'.
*/
target->magic = 0; /* Invalidate 'target' in case of failure. */
target->ndata = isc_mem_get(mctx, source->length);
if (target->ndata == NULL)
return (DNS_R_NOMEMORY);
@@ -2743,13 +2746,9 @@ dns_name_dup(dns_name_t *source, isc_mem_t *mctx, unsigned char *offsets,
target->attributes = DNS_NAMEATTR_DYNAMIC | DNS_NAMEATTR_READONLY;
if ((source->attributes & DNS_NAMEATTR_ABSOLUTE) != 0)
target->attributes |= DNS_NAMEATTR_ABSOLUTE;
target->offsets = offsets;
if (offsets != NULL)
if (target->offsets != NULL)
set_offsets(target, target->offsets, ISC_FALSE, ISC_FALSE,
ISC_FALSE);
target->buffer = NULL;
ISC_LINK_INIT(target, link);
ISC_LIST_INIT(target->list);
return (DNS_R_SUCCESS);
}