From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 15 Dec 2017 21:54:34 +0000 (+0000)
Subject: Zero length octets attributes are a thing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3167abfdef894ed4c329bec91d370e71ec2e09f;p=thirdparty%2Ffreeradius-server.git

Zero length octets attributes are a thing
---

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index 7996a5a9248..4b76fd1206a 100644
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -3338,8 +3338,10 @@ char *fr_value_box_asprint(TALLOC_CTX *ctx, fr_value_box_t const *data, char quo
 		p[0] = '0';
 		p[1] = 'x';
 
-		fr_bin2hex(p + 2, data->vb_octets, data->datum.length);
-		p[2 + (data->datum.length * 2)] = '\0';
+		if (data->vb_octets) {
+			fr_bin2hex(p + 2, data->vb_octets, data->datum.length);
+			p[2 + (data->datum.length * 2)] = '\0';
+		}
 		break;
 
 	/*
@@ -3726,9 +3728,11 @@ size_t fr_value_box_snprint(char *out, size_t outlen, fr_value_box_t const *data
 		}
 
 		/* Get maximum number of uint8s we can encode given freespace */
-		max = ((freespace % 2) ? freespace - 1 : freespace - 2) / 2;
-		fr_bin2hex(out, data->vb_octets,
-			   ((size_t)data->datum.length > max) ? max : (size_t)data->datum.length);
+		if (data->vb_octets) {
+			max = ((freespace % 2) ? freespace - 1 : freespace - 2) / 2;
+			fr_bin2hex(out, data->vb_octets,
+				   ((size_t)data->datum.length > max) ? max : (size_t)data->datum.length);
+		}
 	}
 		return len;