2408. [bug] A duplicate TCP dispatch event could be sent, which

			could then trigger an assertion failure in
			resquery_response().  [RT #18275]

diff --git a/CHANGES b/CHANGES
index c15ddb8e556da50e439f974dedee5b2537da29bb..0119c43681d4658f915f04f836f31e9578f5386f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2408.  [bug]           A duplicate TCP dispatch event could be sent, which
+                       could then trigger an assertion failure in
+                       resquery_response().  [RT #18275]
+
 2407.  [port]          hpux: test for sys/dyntune.h. [RT #18421]
 
 2406.  [bug]           Sockets could be closed too early, leading to

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 629cf3d3ff46fe79c95046c6947d26a23011f1a4..7cdcf72dc0bb88b5a919d7bf4568d4226798aabe 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.101.2.6.2.32 2008/07/23 23:36:22 marka Exp $ */
+/* $Id: dispatch.c,v 1.101.2.6.2.33 2008/08/05 19:20:39 jinmei Exp $ */
 
 #include <config.h>
 
@@ -3062,7 +3062,7 @@ do_cancel(dns_dispatch_t *disp) {
         */
        LOCK(&qid->lock);
        for (resp = linear_first(qid);
-            resp != NULL && !resp->item_out;
+            resp != NULL && resp->item_out;
             /* Empty. */)
                resp = linear_next(qid, resp);