1121. [bug] The server could attempt to access a NULL zone

			table if shut down while resolving.
			[RT #1587, #2054]

diff --git a/CHANGES b/CHANGES
index ebfbd65ecd281679ff6c20a7442da8e8457bea84..70d98f3c4b0da8257c205440d014c3f2c13a7876 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,10 @@
                        down while a client start event was pending
                        delivery. [RT #2061]
 
+1121.  [bug]           The server could attempt to access a NULL zone
+                       table if shut down while resolving.
+                       [RT #1587, #2054]
+
        --- 9.2.0rc10 released ---
 
 1120.  [bug]           Errors in options were not fatal. [RT #2002]

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index e01b7807fd651c51d5d6010a098fd5c03ce1294b..780ed1d50ecc066e367b3dce595bd2ed81074d60 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.6 2001/11/12 22:37:05 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.7 2001/11/16 21:47:27 bwelling Exp $ */
 
 #include <config.h>
 
@@ -4029,6 +4029,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
        truncated = ISC_FALSE;
        finish = NULL;
 
+       if (fctx->res->exiting) {
+               result = ISC_R_SHUTTINGDOWN;
+               goto done;
+       }
+
        fctx->timeouts = 0;
 
        /*