free tmpzonename and restart_master

diff --git a/CHANGES b/CHANGES
index 9cab2a1c36984af915aea602cca13c6ffed9827e..f232d339baf30d1986d210c4d380949c42211e44 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5092.  [bug]           Address memory leak on SIGTERM in nsupdate when using
+                       GSS-TSIG. [GL #558]
+
 5091.  [func]          Two new global and per-view options max-cache-ttl
                        and min-ncache-ttl [GL #613]
 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 4245dca302804d4dddffd217372bc07e8d89618d..7ffba6be547008c916661445ef451fdb8d3b91c6 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -144,8 +144,8 @@ static dns_fixedname_t fuserzone;
 static dns_fixedname_t fzname;
 static dns_name_t *userzone = NULL;
 static dns_name_t *zname = NULL;
-static dns_name_t tmpzonename;
-static dns_name_t restart_master;
+static dns_name_t tmpzonename = DNS_NAME_INITEMPTY;
+static dns_name_t restart_master = DNS_NAME_INITEMPTY;
 static dns_tsig_keyring_t *gssring = NULL;
 static dns_tsigkey_t *tsigkey = NULL;
 static dst_key_t *sig0key = NULL;
@@ -2354,6 +2354,8 @@ update_completed(isc_task_t *task, isc_event_t *event) {
        if (usegsstsig) {
                dns_name_free(&tmpzonename, gmctx);
                dns_name_free(&restart_master, gmctx);
+               dns_name_init(&tmpzonename, 0);
+               dns_name_init(&restart_master, 0);
        }
        isc_event_free(&event);
        done_update();
@@ -2769,6 +2771,8 @@ failed_gssrequest() {
 
        dns_name_free(&tmpzonename, gmctx);
        dns_name_free(&restart_master, gmctx);
+       dns_name_init(&tmpzonename, NULL);
+       dns_name_init(&restart_master, NULL);
 
        done_update();
 }
@@ -3178,6 +3182,12 @@ cleanup(void) {
                isc_mem_free(gmctx, realm);
                realm = NULL;
        }
+       if (dns_name_dynamic(&tmpzonename)) {
+               dns_name_free(&tmpzonename, gmctx);
+       }
+       if (dns_name_dynamic(&restart_master)) {
+               dns_name_free(&restart_master, gmctx);
+       }
 #endif
 
        if (sig0key != NULL)

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 871bd5791c651828132a61e448e7e6a0753eab59..ae840785fbf47b0d78808a5080719acdaf954a6d 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -182,6 +182,11 @@ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname;
        {NULL, NULL} \
 }
 
+#define DNS_NAME_INITEMPTY { \
+       DNS_NAME_MAGIC, NULL, 0, 0, 0, NULL, NULL, \
+       { (void *)-1, (void *)-1 }, { NULL, NULL } \
+}
+
 /*%
  * Standard size of a wire format name
  */