From: Willem Toorop <willem@NLnetLabs.nl>
Date: Mon, 13 Feb 2012 21:14:12 +0000 (+0000)
Subject: test before commit :(
X-Git-Tag: release-1.6.13rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8ac6c4ab2bab594f0c14639b3f32fade160f360;p=thirdparty%2Fldns.git

test before commit :(
---

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 4693a0e3..167da426 100644
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -509,7 +509,7 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE *out,
 	
 	if (!sibmap) {
 		treedepth = ldns_dnssec_trust_tree_depth(tree);
-		sibmap = LDNS_MALLOC(treedepth);
+		sibmap = LDNS_XMALLOC(uint8_t, treedepth);
                 if(!sibmap)
                         return; /* mem err */
 		memset(sibmap, 0, treedepth);
diff --git a/keys.c b/keys.c
index 615b314f..706f7f2c 100644
--- a/keys.c
+++ b/keys.c
@@ -1532,6 +1532,7 @@ ldns_key_free(ldns_key *key)
 void
 ldns_key_deep_free(ldns_key *key)
 {
+	unsigned char* hmac;
 	if (ldns_key_pubkey_owner(key)) {
 		ldns_rdf_deep_free(ldns_key_pubkey_owner(key));
 	}
@@ -1541,7 +1542,8 @@ ldns_key_deep_free(ldns_key *key)
 	}
 #endif /* HAVE_SSL */
 	if (ldns_key_hmac_key(key)) {
-		LDNS_FREE(ldns_key_hmac_key(key));
+		hmac = ldns_key_hmac_key(key);
+		LDNS_FREE(hmac);
 	}
 	LDNS_FREE(key);
 }
diff --git a/rbtree.c b/rbtree.c
index f7fdcc35..4fbc067e 100644
--- a/rbtree.c
+++ b/rbtree.c
@@ -43,7 +43,7 @@
 
 #include <ldns/config.h>
 #include <ldns/rbtree.h>
-#include <ldns/utils.h>
+#include <ldns/util.h>
 #include <stdlib.h>
 
 /** Node colour black */
@@ -82,7 +82,7 @@ ldns_rbtree_create (int (*cmpf)(const void *, const void *))
 	ldns_rbtree_t *rbtree;
 
 	/* Allocate memory for it */
-	rbtree = (ldns_rbtree_t *) LDNS_MALLOC(sizeof(ldns_rbtree_t));
+	rbtree = (ldns_rbtree_t *) LDNS_MALLOC(ldns_rbtree_t);
 	if (!rbtree) {
 		return NULL;
 	}