From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 20 Mar 2022 20:11:10 +0000 (-0400)
Subject: minor cleanups
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bffa50cd8dde60d5a04f5ec7991d63becef82ff4;p=thirdparty%2Ffreeradius-server.git

minor cleanups
---

diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c
index 71bcf33f164..2de6cccb275 100644
--- a/src/protocols/dhcpv4/decode.c
+++ b/src/protocols/dhcpv4/decode.c
@@ -213,7 +213,6 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t
 		}
 
 		if (da_is_bits_prefix(vp->da)) {
-			uint32_t ipaddr, mask;
 			size_t needs;
 
 			if ((data_len == 0) || (*p > 32)) goto raw;
@@ -221,9 +220,9 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t
 			needs = 1 + ((*p + 0x07) >> 3);
 			if (data_len < needs) goto raw;
 
-#if 0
-			if (exact && (data_len > needs)) goto raw;
-#endif
+			/*
+			 *	Don't do exact checks here, as the content is variable-sized.
+			 */
 
 			vp->vp_ip.prefix = *p;
 
@@ -231,6 +230,8 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t
 			 *	If the IP address is longer than necessary, then only grab the pieces we need.
 			 */
 			if (vp->vp_ip.prefix) {
+				uint32_t ipaddr, mask;
+
 				mask = ~(uint32_t) 0;
 				mask <<= (32 - vp->vp_ip.prefix);
 
@@ -249,12 +250,10 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t
 					ipaddr = p[1];
 					ipaddr <<= 24;
 				}
-			} else { /* prefix == 0 */
-				ipaddr = 0;
-				mask = 0;
-			}
 
-			vp->vp_ipv4addr = htonl(ipaddr & mask);
+				vp->vp_ipv4addr = htonl(ipaddr & mask);
+			} /* else *p==0, and we leave ipaddr set to zero */
+
 			p += needs;
 			break;
 		}
diff --git a/src/tests/unit/protocols/dhcpv4/base.txt b/src/tests/unit/protocols/dhcpv4/base.txt
index eedfaee231c..dc1e7814bb3 100644
--- a/src/tests/unit/protocols/dhcpv4/base.txt
+++ b/src/tests/unit/protocols/dhcpv4/base.txt
@@ -59,7 +59,7 @@ match 0e 00
 #  Decoding empty options yields empty data
 #
 decode-pair -
-match Merit-Dump-File = 0x
+match Merit-Dump-File = ""
 
 # 255 bytes are OK
 encode-pair Domain-Name = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"