Upgrade to 1.6.16

1 files changed, 3 insertions, 45 deletions

diff --git a/contrib/ldns/host2wire.c b/contrib/ldns/host2wire.c
index b5b0ba8..de1e01e 100644
--- a/contrib/ldns/host2wire.c
+++ b/contrib/ldns/host2wire.c
@@ -341,7 +341,6 @@ ldns_status
 ldns_rdf2wire(uint8_t **dest, const ldns_rdf *rdf, size_t *result_size)
 {
 	ldns_buffer *buffer = ldns_buffer_new(LDNS_MAX_PACKETLEN);
-	uint8_t *result = NULL;
 	ldns_status status;
 	*result_size = 0;
 	*dest = NULL;
@@ -350,21 +349,8 @@ ldns_rdf2wire(uint8_t **dest, const ldns_rdf *rdf, size_t *result_size)
 	status = ldns_rdf2buffer_wire(buffer, rdf);
 	if (status == LDNS_STATUS_OK) {
 		*result_size =  ldns_buffer_position(buffer);
-		result = (uint8_t *) ldns_buffer_export(buffer);
-	} else {
-		ldns_buffer_free(buffer);
-		return status;
-	}
-	
-	if (result) {
-		*dest = LDNS_XMALLOC(uint8_t, ldns_buffer_position(buffer));
-		if(!*dest) {
-			ldns_buffer_free(buffer);
-			return LDNS_STATUS_MEM_ERR;
-		}
-		memcpy(*dest, result, ldns_buffer_position(buffer));
+		*dest = (uint8_t *) ldns_buffer_export(buffer);
 	}
-	
 	ldns_buffer_free(buffer);
 	return status;
 }
@@ -373,7 +359,6 @@ ldns_status
 ldns_rr2wire(uint8_t **dest, const ldns_rr *rr, int section, size_t *result_size)
 {
 	ldns_buffer *buffer = ldns_buffer_new(LDNS_MAX_PACKETLEN);
-	uint8_t *result = NULL;
 	ldns_status status;
 	*result_size = 0;
 	*dest = NULL;
@@ -382,21 +367,8 @@ ldns_rr2wire(uint8_t **dest, const ldns_rr *rr, int section, size_t *result_size
 	status = ldns_rr2buffer_wire(buffer, rr, section);
 	if (status == LDNS_STATUS_OK) {
 		*result_size =  ldns_buffer_position(buffer);
-		result = (uint8_t *) ldns_buffer_export(buffer);
-	} else {
-		ldns_buffer_free(buffer);
-		return status;
+		*dest = (uint8_t *) ldns_buffer_export(buffer);
 	}
-	
-	if (result) {
-		*dest = LDNS_XMALLOC(uint8_t, ldns_buffer_position(buffer));
-		if(!*dest) {
-			ldns_buffer_free(buffer);
-			return LDNS_STATUS_MEM_ERR;
-		}
-		memcpy(*dest, result, ldns_buffer_position(buffer));
-	}
-	
 	ldns_buffer_free(buffer);
 	return status;
 }
@@ -405,7 +377,6 @@ ldns_status
 ldns_pkt2wire(uint8_t **dest, const ldns_pkt *packet, size_t *result_size)
 {
 	ldns_buffer *buffer = ldns_buffer_new(LDNS_MAX_PACKETLEN);
-	uint8_t *result = NULL;
 	ldns_status status;
 	*result_size = 0;
 	*dest = NULL;
@@ -414,21 +385,8 @@ ldns_pkt2wire(uint8_t **dest, const ldns_pkt *packet, size_t *result_size)
 	status = ldns_pkt2buffer_wire(buffer, packet);
 	if (status == LDNS_STATUS_OK) {
 		*result_size =  ldns_buffer_position(buffer);
-		result = (uint8_t *) ldns_buffer_export(buffer);
-	} else {
-		ldns_buffer_free(buffer);
-		return status;
+		*dest = (uint8_t *) ldns_buffer_export(buffer);
 	}
-	
-	if (result) {
-		*dest = LDNS_XMALLOC(uint8_t, ldns_buffer_position(buffer));
-		if(!*dest) {
-			ldns_buffer_free(buffer);
-			return LDNS_STATUS_MEM_ERR;
-		}
-		memcpy(*dest, result, ldns_buffer_position(buffer));
-	}
-	
 	ldns_buffer_free(buffer);
 	return status;
 }