From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 16 Feb 2016 16:21:46 +0000 (-0500)
Subject: More checks as per commit 39149c
X-Git-Tag: release_3_0_12~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92ae05fa910e05e747f22207d4917e234a5259d;p=thirdparty%2Ffreeradius-server.git

More checks as per commit 39149c
---

diff --git a/src/lib/radius.c b/src/lib/radius.c
index a2124b34fc8..5610a49a354 100644
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -1550,11 +1550,11 @@ int rad_vp2vsa(RADIUS_PACKET const *packet, RADIUS_PACKET const *original,
 	lvalue = htonl(vp->da->vendor);
 	memcpy(ptr + 2, &lvalue, 4);
 
-	if (room > ((unsigned) 255 - ptr[1])) room = 255 - ptr[1];
+	if (room > 255) room = 255;
 
 	len = vp2attr_vsa(packet, original, secret, pvp,
 			  vp->da->attr, vp->da->vendor,
-			  ptr + ptr[1], room);
+			  ptr + ptr[1], room - ptr[1]);
 	if (len < 0) return len;
 
 #ifndef NDEBUG