From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Tue, 26 Jul 2005 12:52:52 +0000 (+0000)
Subject: memtweaky
X-Git-Tag: release-0.70~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a40b01831eabc33ac79eef6d76d400d066a12b9f;p=thirdparty%2Fldns.git

memtweaky
---

diff --git a/buffer.c b/buffer.c
index cc8eae8f..a34e344a 100644
--- a/buffer.c
+++ b/buffer.c
@@ -45,7 +45,8 @@ ldns_buffer_new_frm_data(ldns_buffer *buffer, void *data, size_t size)
 
 	buffer->_position = 0;
 	buffer->_limit = buffer->_capacity = size;
-	buffer->_data = (uint8_t *) data;
+	buffer->_data = LDNS_XMALLOC(uint8_t, size);
+	memcpy(buffer->_data, data, size);
 	buffer->_fixed = 1;
 	buffer->_status = LDNS_STATUS_OK;
 	
@@ -163,13 +164,9 @@ ldns_buffer_free(ldns_buffer *buffer)
 	if (!buffer) {
 		return;
 	}
-/*
-	if (!buffer->_fixed) {
-*/
-		LDNS_FREE(buffer->_data);
-/*
-	}
-*/
+
+	LDNS_FREE(buffer->_data);
+
 	LDNS_FREE(buffer);
 }
 
diff --git a/rr.c b/rr.c
index 2ac952a4..66e94535 100644
--- a/rr.c
+++ b/rr.c
@@ -258,7 +258,7 @@ ldns_rr_new_frm_str(const char *str)
 	
 
 	LDNS_FREE(rd);
-	LDNS_FREE(rd_buf);
+	ldns_buffer_free(rd_buf);
 	ldns_buffer_free(rr_buf);
 
 	LDNS_FREE(rdata);