From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 5 Nov 2019 22:34:06 +0000 (-0500)
Subject: allow decode of zero-length strings
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0523ffe5e57e4701ad83f17d4a6430008d4b2153;p=thirdparty%2Ffreeradius-server.git

allow decode of zero-length strings
---

diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c
index fa9a33cac3e..d0ad044c48a 100644
--- a/src/protocols/dhcpv6/decode.c
+++ b/src/protocols/dhcpv6/decode.c
@@ -239,7 +239,7 @@ static ssize_t decode_array(TALLOC_CTX *ctx, fr_cursor_t *cursor, fr_dict_t cons
 	 *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-...-+-+-+-+-+-+-+
 	 */
 	while (p < end) {
-		if ((end - p) <= 2) {
+		if ((end - p) < 2) {
 		raw:
 			slen = decode_raw(ctx, cursor, dict, parent, p, end - p , decoder_ctx);
 			if (slen < 0) return slen;
@@ -252,7 +252,7 @@ static ssize_t decode_array(TALLOC_CTX *ctx, fr_cursor_t *cursor, fr_dict_t cons
 		}
 
 		p += 2;
-		slen = decode_value(ctx, cursor, dict, parent, p, element_len , decoder_ctx);
+		slen = decode_value(ctx, cursor, dict, parent, p, element_len, decoder_ctx);
 		if (slen < 0) return slen;
 		p += slen;
 	}