memory.

configure.ac has changed, so remember to autoreconf again

diff --git a/configure.ac b/configure.ac
index e6055590dc0b7de1fd0b0b07f9dd95b7b07d88d1..8b2b67d1410c1c1abbf2b53e99fb10745307a920 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,7 @@ int b64_pton(char const *src, uint8_t *target, size_t targsize);
 /*@unused@*/
 static inline size_t b64_pton_calculate_size(size_t srcsize)
 {
-       return ((((srcsize / 4) * 3) - 2) + 1);
+       return ((((srcsize / 4) * 3) - 2) + 2);
 }
 #endif /* !B64_NTOP */
 #ifndef TIMEGM

diff --git a/dnssec.c b/dnssec.c
index 19b5c2c2f182527c57a5f65eba82de611d85f806..344e27100272e6c6b870ecc541626698e036f3eb 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -756,7 +756,7 @@ ldns_pkt_tsig_verify(ldns_pkt *pkt,
        ldns_rr *orig_tsig = ldns_pkt_tsig(pkt);
        
        if (!orig_tsig) {
-               ldns_rdf_free(key_name_rdf);
+               ldns_rdf_deep_free(key_name_rdf);
                return false;
        }
        algorithm_rdf = ldns_rr_rdf(orig_tsig, 0);
@@ -789,7 +789,10 @@ ldns_pkt_tsig_verify(ldns_pkt *pkt,
                                      orig_mac_rdf
                                     );
        
+       LDNS_FREE(prepared_wire);
+       
        if (status != LDNS_STATUS_OK) {
+               ldns_rdf_deep_free(key_name_rdf);
                return false;
        }
        /* Put back the values */
@@ -800,10 +803,10 @@ ldns_pkt_tsig_verify(ldns_pkt *pkt,
        
        /* TODO: ldns_rdf_cmp in rdata.[ch] */
        if (ldns_rdf_compare(pkt_mac_rdf, my_mac_rdf) == 0) {
-               ldns_rdf_free(my_mac_rdf);
+               ldns_rdf_deep_free(my_mac_rdf);
                return true;
        } else {
-               ldns_rdf_free(my_mac_rdf);
+               ldns_rdf_deep_free(my_mac_rdf);
                return false;
        }
 }