1884. [bug] process_dhtkey() was using the wrong memory context

                        to free some memory. [RT #14890]

diff --git a/CHANGES b/CHANGES
index 45c60748e07c6f9749b4a0432662949abab586ab..8ce16735c16a0ecf5228ad3162a4c436e8a853c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1884.  [bug]           process_dhtkey() was using the wrong memory context
+                       to free some memory. [RT #14890]
+
 1883.  [port]          sunos: portability fixes. [RT #14814]
 
 1882.  [port]          win32: isc__errno2result() now reports its caller.

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 2f7696b98821c6af672985ae2387db8eebc210b9..7ff4556a4b96d492e36915184939fbf5f7aff564 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.79 2005/04/29 00:22:53 marka Exp $
+ * $Id: tkey.c,v 1.80 2005/06/10 06:58:27 marka Exp $
  */
 /*! \file */
 #include <config.h>
@@ -356,7 +356,7 @@ process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name,
 
        isc_buffer_init(&secret, secretdata, sizeof(secretdata));
 
-       randomdata = isc_mem_get(tctx->mctx, TKEY_RANDOM_AMOUNT);
+       randomdata = isc_mem_get(tkeyout->mctx, TKEY_RANDOM_AMOUNT);
        if (randomdata == NULL)
                goto failure;
 
@@ -397,8 +397,8 @@ process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name,
                isc_buffer_free(&shared);
        if (pubkey != NULL)
                dst_key_free(&pubkey);
-       if (randomdata == NULL)
-               isc_mem_put(tctx->mctx, randomdata, TKEY_RANDOM_AMOUNT);
+       if (randomdata != NULL)
+               isc_mem_put(tkeyout->mctx, randomdata, TKEY_RANDOM_AMOUNT);
        return (result);
 }