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 6731572f5d09b741249a070d4189876f9a9ceb81..74a3084a6d59c4b1daf43d864a76e7b1d80bbfbc 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 53916c07c17b8352629513634291f590c2e89a4c..1767c5523d58e619e7107c4f0e67576dc06a9a50 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.149 2008/07/23 23:27:54 marka Exp $ */
+/* $Id: dispatch.c,v 1.150 2008/08/05 19:18:02 jinmei Exp $ */
 
 /*! \file */
 
@@ -3085,7 +3085,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);