From: James Jones Date: Thu, 25 May 2023 18:37:11 +0000 (-0500) Subject: Remove uninit_use_in_call annotations to verity model X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b308ed52aff956908135081317258de078008515;p=thirdparty%2Ffreeradius-server.git Remove uninit_use_in_call annotations to verity model --- diff --git a/src/bin/radict.c b/src/bin/radict.c index 191cd6f8802..6795c2fc5fb 100644 --- a/src/bin/radict.c +++ b/src/bin/radict.c @@ -165,7 +165,6 @@ static void da_print_info_td(fr_dict_t const *dict, fr_dict_attr_t const *da) fr_dict_attr_flags_print(&FR_SBUFF_OUT(flags, sizeof(flags)), dict, da->type, &da->flags); /* Protocol Name Type */ - /* coverity[uninit_use_in_call] */ switch(output_format) { case RADICT_OUT_CSV: diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c index f6db58cb639..064719f21d6 100644 --- a/src/bin/radsniff.c +++ b/src/bin/radsniff.c @@ -470,7 +470,6 @@ static void rs_packet_print_fancy(uint64_t count, rs_status_t status, fr_pcap_t fr_base16_encode(&FR_SBUFF_OUT(vector, sizeof(vector)), &FR_DBUFF_TMP(packet->vector, RADIUS_AUTH_VECTOR_LENGTH)); - /* coverity[uninit_use_in_call] */ INFO("\tAuthenticator-Field = 0x%s", vector); } } @@ -512,7 +511,6 @@ static void rs_packet_save_in_output_dir(uint64_t count, UNUSED rs_status_t stat fr_base16_encode(&FR_SBUFF_OUT(vector, sizeof(vector)), &FR_DBUFF_TMP(packet->vector, RADIUS_AUTH_VECTOR_LENGTH)); - /* coverity[uninit_use_in_call] */ fprintf(output_file.handle, "Authenticator-Field = 0x%s\n", vector); if (fr_log_close(&output_file) < 0) { diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c index ef471905bc4..33fd88767b6 100644 --- a/src/lib/server/tmpl_tokenize.c +++ b/src/lib/server/tmpl_tokenize.c @@ -2616,7 +2616,6 @@ static ssize_t tmpl_afrom_ether_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t vb = tmpl_value(vpt); fr_value_box_init(vb, FR_TYPE_ETHERNET, NULL, false); - /* coverity[uninit_use_in_call] */ memcpy(vb->vb_ether, buff, sizeof(vb->vb_ether)); *out = vpt; diff --git a/src/lib/util/calc.c b/src/lib/util/calc.c index 30dea38bdd7..8cec6ca9386 100644 --- a/src/lib/util/calc.c +++ b/src/lib/util/calc.c @@ -973,9 +973,7 @@ static int calc_octets(TALLOC_CTX *ctx, fr_value_box_t *dst, fr_value_box_t cons return ERR_INVALID; /* invalid operator */ } - /* coverity[uninit_use_in_call] */ if (a == &one) fr_value_box_clear_value(&one); - /* coverity[uninit_use_in_call] */ if (b == &two) fr_value_box_clear_value(&two); return 0; diff --git a/src/lib/util/sbuff_tests.c b/src/lib/util/sbuff_tests.c index b636ca1494b..527448dbad3 100644 --- a/src/lib/util/sbuff_tests.c +++ b/src/lib/util/sbuff_tests.c @@ -113,7 +113,6 @@ static void test_bstrncpy_exact(void) TEST_CASE("Copy 5 bytes to out"); slen = fr_sbuff_out_bstrncpy_exact(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, 5); - /* coverity[uninit_use_in_call] */ TEST_CHECK_SLEN(slen, 5); TEST_CHECK_STRCMP(out, "i am "); TEST_CHECK_STRCMP(sbuff.p, "a test string"); @@ -167,7 +166,6 @@ static void test_bstrncpy(void) TEST_CASE("Copy 5 bytes to out"); slen = fr_sbuff_out_bstrncpy(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, 5); TEST_CHECK_SLEN(slen, 5); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(out, "i am "); TEST_CHECK_STRCMP(sbuff.p, "a test string"); @@ -243,7 +241,6 @@ static void test_bstrncpy_allowed(void) TEST_CASE("Copy 5 bytes to out"); slen = fr_sbuff_out_bstrncpy_allowed(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, 5, allow_lowercase_and_space); TEST_CHECK_SLEN(slen, 5); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(out, "i am "); TEST_CHECK_STRCMP(sbuff.p, "a test string"); @@ -332,7 +329,6 @@ static void test_bstrncpy_until(void) TEST_CASE("Copy 5 bytes to out"); slen = fr_sbuff_out_bstrncpy_until(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, 5, NULL, NULL); TEST_CHECK_SLEN(slen, 5); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(out, "i am "); TEST_CHECK_STRCMP(sbuff.p, "a test string"); @@ -460,7 +456,6 @@ static void test_unescape_until(void) TEST_CASE("Copy 5 bytes to out"); slen = fr_sbuff_out_unescape_until(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, 5, NULL, &rules); TEST_CHECK_SLEN(slen, 5); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(out, "i am "); TEST_CHECK_STRCMP(sbuff.p, "a test string"); @@ -538,7 +533,6 @@ static void test_unescape_until(void) slen = fr_sbuff_out_unescape_until(&FR_SBUFF_OUT(escape_out, sizeof(escape_out)), &sbuff, SIZE_MAX, &FR_SBUFF_TERM("g"), &pipe_rules); TEST_CHECK_SLEN(slen, 20); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(escape_out, "i am a |t|est string"); TEST_CHECK_STRCMP(sbuff.p, ""); @@ -547,7 +541,6 @@ static void test_unescape_until(void) slen = fr_sbuff_out_unescape_until(&FR_SBUFF_OUT(escape_out, sizeof(escape_out)), &sbuff, SIZE_MAX, &FR_SBUFF_TERM("g"), &pipe_rules_sub); TEST_CHECK_SLEN(slen, 20); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(escape_out, "i am a |t|est strinh"); TEST_CHECK_STRCMP(sbuff.p, ""); @@ -722,7 +715,6 @@ static void test_unescape_multi_char_terminals(void) slen = fr_sbuff_out_bstrncpy_until(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, SIZE_MAX, &tt, NULL); TEST_CHECK(slen == 3); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(out, "foo"); fr_sbuff_advance(&sbuff, 1); @@ -756,14 +748,12 @@ static void test_eof_terminal(void) slen = fr_sbuff_out_bstrncpy_until(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, SIZE_MAX, &tt_eof, NULL); TEST_CHECK(slen == 3); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(out, "foo"); fr_sbuff_advance(&sbuff, 1); /* Advance past comma */ slen = fr_sbuff_out_bstrncpy_until(&FR_SBUFF_OUT(out, sizeof(out)), &sbuff, SIZE_MAX, &tt_eof, NULL); TEST_CHECK(slen == 4); - /* coverity[uninit_use_in_call] */ TEST_CHECK_STRCMP(out, " bar"); TEST_CHECK(fr_sbuff_is_terminal(&sbuff, &tt_eof) == true); diff --git a/src/lib/util/value.c b/src/lib/util/value.c index 048e9362dca..1bcde893181 100644 --- a/src/lib/util/value.c +++ b/src/lib/util/value.c @@ -4960,7 +4960,6 @@ parse: fr_base16_decode(&err, &dbuff, &our_in, true); if (err != FR_SBUFF_PARSE_OK) goto ether_error; - /* coverity[uninit_use_in_call] */ fr_value_box_ethernet_addr(dst, dst_enumv, ðer, tainted); FR_SBUFF_SET_RETURN(in, &our_in); diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index b8bde1dd9f4..f5b2ba299ef 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -788,7 +788,6 @@ static unlang_action_t CC_HINT(nonnull) pap_auth_lm(rlm_rcode_t *p_result, len = xlat_eval(charbuf, sizeof(charbuf), request, "%(mschap:LM-Hash %{User-Password})", NULL, NULL); if (len < 0) RETURN_MODULE_FAIL; - /* coverity[uninit_use_in_call] */ if ((fr_base16_decode(NULL, &FR_DBUFF_TMP(digest, sizeof(digest)), &FR_SBUFF_IN(charbuf, len), false) != (ssize_t)known_good->vp_length) || (fr_digest_cmp(digest, known_good->vp_octets, known_good->vp_length) != 0)) { @@ -854,7 +853,6 @@ static unlang_action_t CC_HINT(nonnull) pap_auth_ns_mta_md5(rlm_rcode_t *p_resul fr_md5_calc(buff, (uint8_t *) buff2, p - buff2); } - /* coverity[uninit_use_in_call] */ if (fr_digest_cmp(digest, buff, 16) != 0) { REDEBUG("NS-MTA-MD5 digest does not match \"known good\" digest"); RETURN_MODULE_REJECT;