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

Make sure chain_name and dns_rbtnodechain_current do not try to do

Browse Source 
NODENAME() on a NULL chain->end (such as after the chain has been reset.)
This commit is contained in:
David Lawrence 1999-04-17 15:43:10 +00:00
parent c234ac00b8
commit f8dd2e939e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/dns/rbt.c
View File

@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: rbt.c,v 1.42 1999/04/17 15:19:45 tale Exp $ */ /* $Id: rbt.c,v 1.43 1999/04/17 15:43:10 tale Exp $ */
/* Principal Authors: DCL */ /* Principal Authors: DCL */
@ -293,7 +293,7 @@ chain_name(dns_rbtnodechain_t *chain, dns_name_t *name,
dns_name_init(&nodename, NULL); dns_name_init(&nodename, NULL);
/* /*
* XXX Is this too devilish, initializing name like this? * XXX DCL Is this too devilish, initializing name like this?
*/ */
result = dns_name_concatenate(NULL, NULL, name, NULL); result = dns_name_concatenate(NULL, NULL, name, NULL);
if (result != DNS_R_SUCCESS) if (result != DNS_R_SUCCESS)
@ -307,7 +307,8 @@ chain_name(dns_rbtnodechain_t *chain, dns_name_t *name,
break; break;
} }
if (result == DNS_R_SUCCESS && include_chain_end) { if (result == DNS_R_SUCCESS &&
include_chain_end && chain->end != NULL) {
NODENAME(chain->end, &nodename); NODENAME(chain->end, &nodename);
result = dns_name_concatenate(&nodename, name, name, NULL); result = dns_name_concatenate(&nodename, name, name, NULL);
} }
@ -1849,7 +1850,15 @@ dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name,
REQUIRE(VALID_CHAIN(chain)); REQUIRE(VALID_CHAIN(chain));
if (name != NULL) { if (name != NULL) {
NODENAME(chain->end, name); if (chain->end != NULL)
NODENAME(chain->end, name);
else
/*
* Any offsets are zapped by this call, but they
* would have been redirected anyway if there
* was a chain_end.
*/
dns_name_init(name, NULL);
if (chain->level_count == 0) { if (chain->level_count == 0) {
/* /*