From: James Jones <jejones3141@gmail.com>
Date: Thu, 20 Apr 2023 14:05:43 +0000 (-0500)
Subject: Assure that aside from 0, reply_code() will return a valid code. (#4966)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18df2665e025b1cf546531ab736b3aa543a59403;p=thirdparty%2Ffreeradius-server.git

Assure that aside from 0, reply_code() will return a valid code. (#4966)

Uncertainty about this appears to cause the coverity defects in
src/process/tacacs/base.c.
---

diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index eae72768c48..2c92e724938 100644
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -431,7 +431,7 @@ static uint32_t reply_code(request_t *request, fr_dict_attr_t const *status_da,
 	vp = fr_pair_find_by_da(&request->reply_pairs, NULL, status_da);
 	if (vp) {
 		code = status2code[vp->vp_uint8];
-		if (code > 0) {
+		if (FR_TACACS_PACKET_CODE_VALID(code)) {
 			RDEBUG("Setting reply Packet-Type from %pP", vp);
 			return code;
 		}
@@ -440,12 +440,12 @@ static uint32_t reply_code(request_t *request, fr_dict_attr_t const *status_da,
 
 	if (state) {
 		code = state->packet_type[rcode];
-		if (code > 0) return code;
+		if (FR_TACACS_PACKET_CODE_VALID(code)) return code;
 	}
 
 	if (process_rcode) {
 		code = process_rcode[rcode];
-		if (code) return code;
+		if (FR_TACACS_PACKET_CODE_VALID(code)) return code;
 	}
 
 	/*