From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Fri, 10 Jun 2005 12:05:20 +0000 (+0000)
Subject: memory.
X-Git-Tag: release-0.65~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94ee43eec6569d9ae1f5660ace1bca606a028cb9;p=thirdparty%2Fldns.git

memory.

configure.ac has changed, so remember to autoreconf again
---

diff --git a/configure.ac b/configure.ac
index e6055590..8b2b67d1 100644
--- 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 19b5c2c2..344e2710 100644
--- 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;
 	}
 }