From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 24 Jan 2021 13:06:51 +0000 (-0500)
Subject: use p / end, and data / data_len
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e1a3eaee506fa6ce43bd032a0b2bd0d2cd3b8b2;p=thirdparty%2Ffreeradius-server.git

use p / end, and data / data_len

mixing and matching is a bad idea
---

diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c
index 917f14435a..271c53e025 100644
--- a/src/protocols/dhcpv4/decode.c
+++ b/src/protocols/dhcpv4/decode.c
@@ -178,12 +178,12 @@ static ssize_t decode_value_internal(TALLOC_CTX *ctx, fr_dcursor_t *cursor, fr_d
 	{
 		ssize_t ret;
 
-		ret = fr_value_box_from_network(vp, &vp->data, vp->da->type, da, p, data_len, true);
+		ret = fr_value_box_from_network(vp, &vp->data, vp->da->type, da, p, end - p, true);
 		if (ret < 0) {
 		raw:
 			FR_PROTO_TRACE("decoding as unknown type");
 			if (fr_pair_to_unknown(vp) < 0) return -1;
-			fr_pair_value_memdup(vp, p, data_len, true);
+			fr_pair_value_memdup(vp, p, end - p, true);
 			ret = data_len;
 		}
 		p += (size_t) ret;