From eed63b97b8d529bb49d1ee8ebe30033103b3b959 Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Tue, 2 Nov 1999 22:22:43 +0000
Subject: [PATCH] +  Core library bugfixes:

@@ -1,12 +1,15 @@
 adns (0.6) unstable; urgency=high

-  Bugfixes:
+  Core library bugfixes:
   * Do not fail assertion if _qf_owner, _qf_search, domain ends in `.'.
   * Avoid infinite timeouts, causing lockup, when they should be zero !
   * TCP handling revamped (avoids recursive-invocation problems).
+  * Two memory leaks (one in all queries, one in cancelled ones) fixed.
+
+  Test and client program bug and portability fixes:
   * Dynamic library building works properly.
   * adnshost prints somewhat better messages about some wrong usages.
-  * Include stdlib.h in adnshost.h.
+  * Include <stdlib.h> and <sys/types.h> in adnshost.h.
   * adnslogres: parsing and error checking improved (Tony Finch).
   * Regresion tests can cope with zero-length reads.
---
 changelog         | 7 +++++--
 client/adnshost.h | 1 +
 src/query.c       | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 2a402b1..2f292b1 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,15 @@
 adns (0.6) unstable; urgency=high
 
-  Bugfixes:
+  Core library bugfixes:
   * Do not fail assertion if _qf_owner, _qf_search, domain ends in `.'.
   * Avoid infinite timeouts, causing lockup, when they should be zero !
   * TCP handling revamped (avoids recursive-invocation problems).
+  * Two memory leaks (one in all queries, one in cancelled ones) fixed.
+
+  Test and client program bug and portability fixes:
   * Dynamic library building works properly.
   * adnshost prints somewhat better messages about some wrong usages.
-  * Include stdlib.h in adnshost.h.
+  * Include <stdlib.h> and <sys/types.h> in adnshost.h.
   * adnslogres: parsing and error checking improved (Tony Finch).
   * Regresion tests can cope with zero-length reads.
 
diff --git a/client/adnshost.h b/client/adnshost.h
index cbde4c2..8b459b3 100644
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -37,6 +37,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/query.c b/src/query.c
index 640d10c..e6bc7a0 100644
--- a/src/query.c
+++ b/src/query.c
@@ -390,6 +390,7 @@ static void free_query_allocs(adns_query qu) {
   for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
   LIST_INIT(qu->allocations);
   adns__vbuf_free(&qu->vb);
+  free(qu->query_dgram);
 }
 
 void adns_cancel(adns_query qu) {
@@ -500,6 +501,7 @@ void adns__query_done(adns_query qu) {
     LIST_UNLINK(qu->ads->childw,parent);
     qu->ctx.callback(parent,qu);
     free_query_allocs(qu);
+    free(qu->answer);
     free(qu);
   } else {
     makefinal_query(qu);
-- 
2.30.2