From a3f965dd1650c7f4aa9bb0a5146263649397f4eb Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 19 Jul 2017 14:34:15 +1000 Subject: [PATCH] 4650. [test] Silence coverity warnings in tsig_test.c. [RT #45528] (cherry picked from commit c0ac259940a7956a07b303a1527c3ebad6e4f64b) --- CHANGES | 2 + lib/dns/tests/tsig_test.c | 86 +++++++++++++++++++-------------------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/CHANGES b/CHANGES index 443ea9ed86..ba2aee2d89 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4650. [test] Silence coverity warnings in tsig_test.c. [RT #45528] + --- 9.10.6 released --- --- 9.10.6rc1 released --- diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c index 62fbedb9b1..87c907383f 100644 --- a/lib/dns/tests/tsig_test.c +++ b/lib/dns/tests/tsig_test.c @@ -180,6 +180,7 @@ render(isc_buffer_t *buf, unsigned flags, dns_tsigkey_t *key, ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_create: %s", dns_result_totext(result)); + ATF_REQUIRE(msg != NULL); msg->id = 50; msg->rcode = dns_rcode_noerror; @@ -278,6 +279,7 @@ ATF_TC_BODY(tsig_tcp, tc) { secret, sizeof(secret), ISC_FALSE, NULL, 0, 0, mctx, ring, &key); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + ATF_REQUIRE(key != NULL); /* * Create request. @@ -298,26 +300,24 @@ ATF_TC_BODY(tsig_tcp, tc) { * Process response message 1. */ result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_create: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_create: %s", + dns_result_totext(result)); + ATF_REQUIRE(msg != NULL); result = dns_message_settsigkey(msg, key); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_settsigkey: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_settsigkey: %s", + dns_result_totext(result)); result = dns_message_parse(msg, buf, 0); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_parse: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_parse: %s", + dns_result_totext(result)); printmessage(msg); result = dns_message_setquerytsig(msg, querytsig); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_setquerytsig: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, + "dns_message_setquerytsig: %s", + dns_result_totext(result)); result = dns_tsig_verify(buf, msg, NULL, NULL); ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, @@ -332,9 +332,9 @@ ATF_TC_BODY(tsig_tcp, tc) { ATF_REQUIRE(dns_message_gettsig(msg, &tsigowner) != NULL); result = dns_message_getquerytsig(msg, mctx, &tsigin); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_getquerytsig: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, + "dns_message_getquerytsig: %s", + dns_result_totext(result)); tsigctx = msg->tsigctx; msg->tsigctx = NULL; @@ -344,6 +344,7 @@ ATF_TC_BODY(tsig_tcp, tc) { result = dst_context_create3(key->key, mctx, DNS_LOGCATEGORY_DNSSEC, ISC_FALSE, &outctx); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); + ATF_REQUIRE(outctx != NULL); /* * Start digesting. @@ -364,30 +365,28 @@ ATF_TC_BODY(tsig_tcp, tc) { * Process response message 2. */ result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_create: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_create: %s", + dns_result_totext(result)); + ATF_REQUIRE(msg != NULL); msg->tcp_continuation = 1; msg->tsigctx = tsigctx; tsigctx = NULL; result = dns_message_settsigkey(msg, key); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_settsigkey: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_settsigkey: %s", + dns_result_totext(result)); result = dns_message_parse(msg, buf, 0); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_parse: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_parse: %s", + dns_result_totext(result)); printmessage(msg); result = dns_message_setquerytsig(msg, tsigin); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_setquerytsig: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, + "dns_message_setquerytsig: %s", + dns_result_totext(result)); result = dns_tsig_verify(buf, msg, NULL, NULL); ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, @@ -415,31 +414,28 @@ ATF_TC_BODY(tsig_tcp, tc) { render(buf, DNS_MESSAGEFLAG_QR, key, &tsigout, &tsigout, outctx); result = add_tsig(outctx, key, buf); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "add_tsig: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "add_tsig: %s", + dns_result_totext(result)); /* * Process response message 3. */ result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_create: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_create: %s", + dns_result_totext(result)); + ATF_REQUIRE(msg != NULL); msg->tcp_continuation = 1; msg->tsigctx = tsigctx; tsigctx = NULL; result = dns_message_settsigkey(msg, key); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_settsigkey: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_settsigkey: %s", + dns_result_totext(result)); result = dns_message_parse(msg, buf, 0); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_parse: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, "dns_message_parse: %s", + dns_result_totext(result)); printmessage(msg); @@ -449,9 +445,9 @@ ATF_TC_BODY(tsig_tcp, tc) { ATF_REQUIRE(dns_message_gettsig(msg, &tsigowner) != NULL); result = dns_message_setquerytsig(msg, tsigin); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_setquerytsig: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, + "dns_message_setquerytsig: %s", + dns_result_totext(result)); result = dns_tsig_verify(buf, msg, NULL, NULL); ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, @@ -464,9 +460,9 @@ ATF_TC_BODY(tsig_tcp, tc) { isc_buffer_free(&tsigin); result = dns_message_getquerytsig(msg, mctx, &tsigin); - ATF_CHECK_EQ_MSG(result, ISC_R_SUCCESS, - "dns_message_getquerytsig: %s", - dns_result_totext(result)); + ATF_REQUIRE_EQ_MSG(result, ISC_R_SUCCESS, + "dns_message_getquerytsig: %s", + dns_result_totext(result)); isc_buffer_free(&buf); dns_message_destroy(&msg);