upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '4090-corrected-bad-insist-logic-in-isc_radix_remove' into 'main'

Browse source 
Resolve "Corrected bad INSIST logic in isc_radix_remove()"

Closes #4090

See merge request isc-projects/bind9!7966
This commit is contained in:
Mark Andrews 2023-05-29 02:22:18 +00:00
commit 3bcc25abf0
2 changed files with 53 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/isc/radix.c
View file

@ -694,13 +694,13 @@ isc_radix_remove(isc_radix_tree_t *radix, isc_radix_node_t *node) {
return;
}
isc_mem_put(radix->mctx, node, sizeof(*node));
radix->num_active_node--;
if (parent->r == node) {
parent->r = child;
} else {
INSIST(parent->l == node);
parent->l = child;
}
isc_mem_put(radix->mctx, node, sizeof(*node));
radix->num_active_node--;
}

50
tests/isc/radix_test.c
View file

@ -30,6 +30,55 @@
#include <tests/isc.h>
/* test radix node removal */
ISC_RUN_TEST_IMPL(isc_radix_remove) {
isc_radix_tree_t *radix = NULL;
isc_radix_node_t *node;
isc_prefix_t prefix;
isc_result_t result;
struct in_addr in_addr;
isc_netaddr_t netaddr;
UNUSED(state);
result = isc_radix_create(mctx, &radix, 32);
assert_int_equal(result, ISC_R_SUCCESS);
in_addr.s_addr = inet_addr("1.1.1.1");
isc_netaddr_fromin(&netaddr, &in_addr);
NETADDR_TO_PREFIX_T(&netaddr, prefix, 32);
node = NULL;
result = isc_radix_insert(radix, &node, NULL, &prefix);
assert_int_equal(result, ISC_R_SUCCESS);
node->data[0] = (void *)32;
isc_refcount_destroy(&prefix.refcount);
in_addr.s_addr = inet_addr("1.0.0.0");
isc_netaddr_fromin(&netaddr, &in_addr);
NETADDR_TO_PREFIX_T(&netaddr, prefix, 8);
node = NULL;
result = isc_radix_insert(radix, &node, NULL, &prefix);
assert_int_equal(result, ISC_R_SUCCESS);
node->data[0] = (void *)8;
isc_refcount_destroy(&prefix.refcount);
in_addr.s_addr = inet_addr("1.1.1.0");
isc_netaddr_fromin(&netaddr, &in_addr);
NETADDR_TO_PREFIX_T(&netaddr, prefix, 24);
node = NULL;
result = isc_radix_insert(radix, &node, NULL, &prefix);
assert_int_equal(result, ISC_R_SUCCESS);
node->data[0] = (void *)24;
isc_refcount_destroy(&prefix.refcount);
isc_radix_remove(radix, node);
isc_radix_destroy(radix, NULL);
}
/* test radix searching */
ISC_RUN_TEST_IMPL(isc_radix_search) {
isc_radix_tree_t *radix = NULL;
@ -80,6 +129,7 @@ ISC_RUN_TEST_IMPL(isc_radix_search) {
ISC_TEST_LIST_START
ISC_TEST_ENTRY(isc_radix_remove)
ISC_TEST_ENTRY(isc_radix_search)
ISC_TEST_LIST_END