More checks as per commit 39149c
authorAlan T. DeKok <aland@freeradius.org>
Tue, 16 Feb 2016 16:21:46 +0000 (11:21 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Tue, 16 Feb 2016 16:21:46 +0000 (11:21 -0500)
src/lib/radius.c

index a2124b3..5610a49 100644 (file)
@@ -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