From: James Jones <jejones3141@gmail.com>
Date: Tue, 31 Jan 2023 15:03:55 +0000 (-0600)
Subject: Handle unchecked returns in src/protocols/dhcpv4/encode.c (CIDs below) (#4874)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c008d48afe72c3cab0b82a767c43864292261af6;p=thirdparty%2Ffreeradius-server.git

Handle unchecked returns in src/protocols/dhcpv4/encode.c (CIDs below) (#4874)

CID 1503896: change fr_dbuff_in() to FR_DBUFF_IN_RETURN()
CID 1504021: annnotate; a preceding FR_DBUFF_REMAINING_RETURN() assures
             that there's enough space for the PEN and data-len1.
---

diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c
index c5518512082..9c7f2fc38c1 100644
--- a/src/protocols/dhcpv4/encode.c
+++ b/src/protocols/dhcpv4/encode.c
@@ -121,7 +121,7 @@ static ssize_t encode_value(fr_dbuff_t *dbuff,
 			FR_DBUFF_IN_MEMCPY_RETURN(&work_dbuff,
 						  (uint8_t const *)&vp->vp_ipv4addr,
 						  sizeof(vp->vp_ipv4addr));
-			fr_dbuff_in(&work_dbuff, mask);
+			FR_DBUFF_IN_RETURN(&work_dbuff, mask);
 			break;
 		}
 
@@ -637,6 +637,7 @@ static ssize_t encode_vsio_hdr(fr_dbuff_t *dbuff,
 	 *	And leave room for data-len1
 	 */
 	fr_dbuff_in_bytes(&work_dbuff, (uint8_t) da->attr, 0x00);
+	/* coverity[check_return] */
 	fr_dbuff_in(&work_dbuff, dv->attr);
 	fr_dbuff_in_bytes(&work_dbuff, (uint8_t) 0x00);