ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '167-coverity-dereferencing-a-null-pointer-in-lib-dns-tests-rbt_test-c' into 'master'

Browse Source 
Resolve "coverity: Dereferencing a null pointer in lib/dns/tests/rbt_test.c"

Closes #167

See merge request isc-projects/bind9!150
This commit is contained in:
Mark Andrews
2018-03-19 08:48:47 -04:00
parent d8f4837fc5 de3a4af1bf
commit 859af8662f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dns/tests/rbt_test.c
View File

@@ -162,11 +162,13 @@ test_context_setup(void) {
name = dns_fixedname_name(&fname);
n = isc_mem_get(mctx, sizeof(size_t));
ATF_REQUIRE(n != NULL);
*n = i + 1;
result = dns_rbt_addname(ctx->rbt, name, n);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
n = isc_mem_get(mctx, sizeof(size_t));
ATF_REQUIRE(n != NULL);
*n = node_distances[i];
result = dns_rbt_addname(ctx->rbt_distances, name, n);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
@@ -359,6 +361,7 @@ ATF_TC_BODY(rbt_check_distance_random, tc) {
char namebuf[34];
n = isc_mem_get(mctx, sizeof(size_t));
ATF_REQUIRE(n != NULL);
*n = i + 1;
while (1) {
@@ -445,6 +448,7 @@ ATF_TC_BODY(rbt_check_distance_ordered, tc) {
dns_name_t *name;
n = isc_mem_get(mctx, sizeof(size_t));
ATF_REQUIRE(n != NULL);
*n = i + 1;
snprintf(namebuf, sizeof(namebuf), "name%08x.", i);
@@ -731,6 +735,7 @@ ATF_TC_BODY(rbt_remove, tc) {
ATF_REQUIRE_EQ(node->data, NULL);
n = isc_mem_get(mctx, sizeof(size_t));
ATF_REQUIRE(n != NULL);
*n = i;
node->data = n;
@@ -1139,6 +1144,7 @@ ATF_TC_BODY(rbt_addname, tc) {
ctx = test_context_setup();
n = isc_mem_get(mctx, sizeof(size_t));
ATF_REQUIRE(n != NULL);
*n = 1;
dns_test_namefromstring("d.e.f.g.h.i.j.k", &fname);
@@ -1150,6 +1156,7 @@ ATF_TC_BODY(rbt_addname, tc) {
/* Now add again, should get ISC_R_EXISTS */
n = isc_mem_get(mctx, sizeof(size_t));
ATF_REQUIRE(n != NULL);
*n = 2;
result = dns_rbt_addname(ctx->rbt, name, n);
ATF_REQUIRE_EQ(result, ISC_R_EXISTS);