X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv6-ia.c;h=a9900011fbe0a37c278aaff7c7ec581be3e5628c;hp=3d9fe831908ac58b0178b71a8d080438b2200fe1;hb=8c623209b062015f98b0b35f3e7aae3de1e87715;hpb=d02dc222e61e2464bf850a629030c8a8b9b57ee8

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 3d9fe83..a990001 100644
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -600,7 +600,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 						.addr = iface->ia_addr[i].addr
 					};
 					p.addr.s6_addr32[1] |= htonl(a->assigned);
-					size_t entrlen = sizeof(p);
+					size_t entrlen = sizeof(p) - 4;
 
 #ifdef DHCPV6_OPT_PREFIX_CLASS
 					if (iface->ia_addr[i].has_class) {
@@ -609,14 +609,14 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 					}
 #endif
 
-					if (datalen + entrlen > buflen || a->assigned == 0)
+					if (datalen + entrlen + 4 > buflen || a->assigned == 0)
 						continue;
 
 					memcpy(buf + datalen, &p, sizeof(p));
 #ifdef DHCPV6_OPT_PREFIX_CLASS
 					memcpy(buf + datalen + sizeof(p), &pclass, sizeof(pclass));
 #endif
-					datalen += entrlen;
+					datalen += entrlen + 4;
 				} else {
 					struct dhcpv6_ia_addr n = {
 						.type = htons(DHCPV6_OPT_IA_ADDR),
@@ -626,7 +626,7 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 						.valid = htonl(prefix_valid)
 					};
 					n.addr.s6_addr32[3] = htonl(a->assigned);
-					size_t entrlen = sizeof(n);
+					size_t entrlen = sizeof(n) - 4;
 
 #ifdef DHCPV6_OPT_PREFIX_CLASS
 					if (iface->ia_addr[i].has_class) {
@@ -635,14 +635,14 @@ static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
 					}
 #endif
 
-					if (datalen + entrlen > buflen || a->assigned == 0)
+					if (datalen + entrlen + 4 > buflen || a->assigned == 0)
 						continue;
 
 					memcpy(buf + datalen, &n, sizeof(n));
 #ifdef DHCPV6_OPT_PREFIX_CLASS
 					memcpy(buf + datalen + sizeof(n), &pclass, sizeof(pclass));
 #endif
-					datalen += entrlen;
+					datalen += entrlen + 4;
 				}
 
 				// Calculate T1 / T2 based on non-deprecated addresses
@@ -900,8 +900,10 @@ size_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
 				a->assigned = reqhint;
 				a->all_class = class_oro;
 				a->classes_cnt = classes_cnt;
-				a->classes = malloc(classes_cnt * sizeof(uint16_t));
-				memcpy(a->classes, classes, classes_cnt * sizeof(uint16_t));
+				if (classes_cnt) {
+					a->classes = malloc(classes_cnt * sizeof(uint16_t));
+					memcpy(a->classes, classes, classes_cnt * sizeof(uint16_t));
+				}
 
 				if (first)
 					memcpy(a->key, first->key, sizeof(a->key));