Clone the saved / query message buffers

The message buffer passed to ns__client_request is only valid for
the life of the the ns__client_request call.  Save a copy of it
when we recurse or process a update as ns__client_request will
return before those operations complete.

(cherry picked from commit f0d9bf7c30a6a219039e19d0a6e61dca874c2294)

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index ef983c3814f125afcf537f3257fec4831ab38725..b89cc6b6d5c268204ba2611a6d48083937218e47 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -1486,6 +1486,16 @@ dns_message_setpadding(dns_message_t *msg, uint16_t padding);
  * \li msg be a valid message.
  */
 
+void
+dns_message_clonebuffer(dns_message_t *msg);
+/*%<
+ * Clone the query or saved buffers if they where not cloned
+ * when parsing.
+ *
+ * Requires:
+ * \li   msg be a valid message.
+ */
+
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_MESSAGE_H */

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 3c3c537cebacea5fd2160c2de1a6187be3bcd662..98fa9177e8fc47a48abd6e39f9d8f72cfa5cc7a5 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -4749,3 +4749,21 @@ dns_message_setpadding(dns_message_t *msg, uint16_t padding) {
        }
        msg->padding = padding;
 }
+
+void
+dns_message_clonebuffer(dns_message_t *msg) {
+       REQUIRE(DNS_MESSAGE_VALID(msg));
+
+       if (msg->free_saved == 0 && msg->saved.base != NULL) {
+               msg->saved.base =
+                       memmove(isc_mem_get(msg->mctx, msg->saved.length),
+                               msg->saved.base, msg->saved.length);
+               msg->free_saved = 1;
+       }
+       if (msg->free_query == 0 && msg->query.base != NULL) {
+               msg->query.base =
+                       memmove(isc_mem_get(msg->mctx, msg->query.length),
+                               msg->query.base, msg->query.length);
+               msg->free_query = 1;
+       }
+}

diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index d6de1ad45ccb287260d3a3627d1c3177c871eb7d..33a52a0212a6f35b72dbb81d5da5e64a9e1a55e9 100644 (file)
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -526,6 +526,7 @@ dns_master_styleflags
 dns_message_addname
 dns_message_buildopt
 dns_message_checksig
+dns_message_clonebuffer
 dns_message_create
 dns_message_currentname
 dns_message_destroy

diff --git a/lib/ns/query.c b/lib/ns/query.c
index b3c16ddc7114e2720dbfa8e3126e8661323cd240..41594ee8fdb91219b4ae1eb8d8ead7c39a973995 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -5889,6 +5889,7 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname,
                        return (result);
                }
 
+               dns_message_clonebuffer(client->message);
                ns_client_recursing(client);
        } else if ((client->attributes & NS_CLIENTATTR_RECURSING) == 0) {
                client->attributes |= NS_CLIENTATTR_RECURSING;

diff --git a/lib/ns/update.c b/lib/ns/update.c
index 83c0fd7cdc62f6b5bb759e2b89f84db2f022ac03..6e0db33c3aed783f6239cdd5c8ef27e23127fa3e 100644 (file)
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -1648,6 +1648,7 @@ ns_update_start(ns_client_t *client, isc_result_t sigresult) {
                if (sigresult != ISC_R_SUCCESS) {
                        FAIL(sigresult);
                }
+               dns_message_clonebuffer(client->message);
                CHECK(send_update_event(client, zone));
                break;
        case dns_zone_slave: