From 73b3ee4b8163d7a172d0b65956254e74ab4e9832 Mon Sep 17 00:00:00 2001
From: venaas <venaas>
Date: Wed, 10 Sep 2008 15:23:29 +0000
Subject: fixed some rewrite bugs

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/branches/release-1.1@372 e88ac4ed-0b26-0410-9574-a7f39faa03bf
---
 radsecproxy.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/radsecproxy.c b/radsecproxy.c
index 8e9ada2..16a1593 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1486,12 +1486,14 @@ int findvendorsubattr(uint32_t *attrs, uint32_t vendor, uint8_t subattr) {
 
 int dovendorrewrite(uint8_t *attrs, uint16_t length, uint32_t *removevendorattrs) {
     uint8_t alen, sublen, rmlen = 0;
-    uint32_t vendor = *(uint32_t *)ATTRVAL(attrs);
+    uint32_t vendor;
     uint8_t *subattrs;
     
     if (!removevendorattrs)
 	return 0;
 
+    memcpy(&vendor, ATTRVAL(attrs), 4);
+    vendor = ntohl(vendor);
     while (*removevendorattrs && *removevendorattrs != vendor)
 	removevendorattrs += 2;
     if (!*removevendorattrs)
@@ -1505,7 +1507,7 @@ int dovendorrewrite(uint8_t *attrs, uint16_t length, uint32_t *removevendorattrs
 	return alen;
     }
 
-    sublen = alen - 4;
+    sublen = alen - 6;
     subattrs = ATTRVAL(attrs) + 4;
     
     if (!attrvalidate(subattrs, sublen)) {
@@ -1600,7 +1602,8 @@ uint8_t *resizeattr(uint8_t **buf, uint8_t **attr, uint8_t newvallen) {
 	    *buf = new;
 	}
     }
-    memmove(*attr + 2 + newvallen, *attr + 2 + vallen, len - (*attr - *buf + newvallen));
+
+    memmove(*attr + 2 + newvallen, *attr + 2 + vallen, len - (*attr - *buf + newvallen + 2));
     (*attr)[1] = newvallen + 2;
     ((uint16_t *)*buf)[1] = htons(len);
     return *attr + 2;
-- 
cgit v1.1