test before commit :(

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 4693a0e33f0aab583ac7c3588cf2e93fe63c3d09..167da4262c2b78ebc2edbf3ef3cdf18c6a06870b 100644 (file)
--- 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 615b314f7225a4ddbd1baee3dfcc324059a8d970..706f7f2cadb5424b0e06c2ccaa28238e0d6e7f7b 100644 (file)
--- 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 f7fdcc352f4a994b13a733c12ca53ad615ab5adc..4fbc067eb70a67d2551b7c92ae1cfe85bc5db8af 100644 (file)
--- 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;
        }