2265. [bug] Test that the memory context's basic_table is non NULL

                        before freeing.  [RT #17265]

diff --git a/CHANGES b/CHANGES
index 8540af619de98ac1d7d36d444d53a6b2191cfcf1..c349fbd5d92c1a47db44cdc17704153240313c37 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2265.  [bug]           Test that the memory context's basic_table is non NULL
+                       before freeing.  [RT #17265]
+
 2264.  [bug]           Server prefix length was being ignored. [RT #17308]
 
 2263.  [bug]           "named-checkconf -z" failed to set default value

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 8251a50f5f0ed3bff43eeff7a38b34edb7ac6771..36b9a7b0340e063fa7d113671c58e44186d59c06 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.136 2007/10/30 23:30:09 marka Exp $ */
+/* $Id: mem.c,v 1.137 2007/11/26 04:27:19 marka Exp $ */
 
 /*! \file */
 
@@ -907,7 +907,8 @@ destroy(isc_mem_t *ctx) {
                for (i = 0; i < ctx->basic_table_count; i++)
                        (ctx->memfree)(ctx->arg, ctx->basic_table[i]);
                (ctx->memfree)(ctx->arg, ctx->freelists);
-               (ctx->memfree)(ctx->arg, ctx->basic_table);
+               if (ctx->basic_table != NULL)
+                       (ctx->memfree)(ctx->arg, ctx->basic_table);
        }
 
        ondest = ctx->ondestroy;