From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 11 Jun 2015 15:39:11 +0000 (-0400)
Subject: Use pairmemcpy instead of doing it manually
X-Git-Tag: release_3_0_9~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f8d2012279bebcf3ef63d1608289fa170f93e9d;p=thirdparty%2Ffreeradius-server.git

Use pairmemcpy instead of doing it manually
---

diff --git a/src/modules/proto_dhcp/dhcp.c b/src/modules/proto_dhcp/dhcp.c
index 0d78913db81..473ccad1fbf 100644
--- a/src/modules/proto_dhcp/dhcp.c
+++ b/src/modules/proto_dhcp/dhcp.c
@@ -652,13 +652,7 @@ static int fr_dhcp_decode_vsa(TALLOC_CTX *ctx, VALUE_PAIR **tlv, uint8_t const *
 	return 0;
 
 malformed:
-	(*tlv)->vp_tlv = talloc_array(*tlv, uint8_t, len);
-	if (!(*tlv)->vp_tlv) {
-		fr_strerror_printf("No memory");
-		return -1;
-	}
-	memcpy((*tlv)->vp_tlv, data, len);
-	(*tlv)->vp_length = len;
+	pairmemcpy(*tlv, data, len);
 
 	return 0;
 }
@@ -812,13 +806,7 @@ static int fr_dhcp_decode_suboption(TALLOC_CTX *ctx, VALUE_PAIR **tlv, uint8_t c
 	return 0;
 
 malformed:
-	(*tlv)->vp_tlv = talloc_array(*tlv, uint8_t, len);
-	if (!(*tlv)->vp_tlv) {
-		fr_strerror_printf("No memory");
-		return -1;
-	}
-	memcpy((*tlv)->vp_tlv, data, len);
-	(*tlv)->vp_length = len;
+	pairmemcpy(*tlv, data, len);
 
 	return 0;
 }