Decode last fragment of extended attrs properly

FreeRADIUS · Nov 1, 2013 · f6de7be · f6de7be
1 parent 88f92be
commit f6de7be
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/lib/radius.c b/src/lib/radius.c
@@ -3115,7 +3115,7 @@ static ssize_t data2vp_extended(RADIUS_PACKET *packet,
 	fraglen = attrlen - 2;
 	frag = data + attrlen;
 	end = data + packetlen;
-	fragments = 0;
+	fragments = 1;
 	last_frag = false;
 
 	while (frag < end) {
@@ -3138,6 +3138,8 @@ static ssize_t data2vp_extended(RADIUS_PACKET *packet,
 	head = tail = malloc(fraglen);
 	if (!head) return -1;
 
+	VP_TRACE("Fragments %d, total length %d\n", fragments, (int) fraglen);
+
 	/*
 	 *	And again, but faster and looser.
 	 *
@@ -3146,7 +3148,7 @@ static ssize_t data2vp_extended(RADIUS_PACKET *packet,
 	 */
 	frag = attr;
 
-	while (fragments > 0) {
+	while (fragments >  0) {
 		memcpy(tail, frag + 4, frag[1] - 4);
 		tail += frag[1] - 4;
 		frag += frag[1];