[master] errors in pipelined queries could assert

4180.	[bug]		Error responses in pipelined queries could
			cause a crash in client.c. [RT #40289]

diff --git a/CHANGES b/CHANGES
index 97e08a47187f9a829aa76c3754c9aea4629773cd..c79ca6526d20e15124f9227938521bc0d7d5889e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4180.  [bug]           Error responses in pipelined queries could
+                       cause a crash in client.c. [RT #40289]
+
 4179.  [bug]           Fix double frees in getaddrinfo() in libirs.
                        [RT #40209]
 

diff --git a/bin/named/client.c b/bin/named/client.c
index dade39d9f94902e8106be2d9b7146e1017b69465..4df385f78bc43eb265a6e190ebc14d2e1d02ae4e 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -387,7 +387,8 @@ exit_check(ns_client_t *client) {
                                return (ISC_TRUE); /* We're done. */
                        } else if (client->mortal) {
                                client->newstate = NS_CLIENTSTATE_INACTIVE;
-                       }
+                       } else
+                               return (ISC_FALSE);
                }
        }