From 70a71de9c95a0375262e607e8347e42ca463210e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 15 Jul 2020 16:07:51 +1000 Subject: [PATCH] Always keep a copy of the message this allows it to be available even when dns_message_parse() returns a error. --- lib/dns/message.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/dns/message.c b/lib/dns/message.c index dd9dd23a12..97425c753b 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -1709,6 +1709,16 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, msg->header_ok = 0; msg->question_ok = 0; + if ((options & DNS_MESSAGEPARSE_CLONEBUFFER) == 0) { + isc_buffer_usedregion(&origsource, &msg->saved); + } else { + msg->saved.length = isc_buffer_usedlength(&origsource); + msg->saved.base = isc_mem_get(msg->mctx, msg->saved.length); + memmove(msg->saved.base, isc_buffer_base(&origsource), + msg->saved.length); + msg->free_saved = 1; + } + isc_buffer_remainingregion(source, &r); if (r.length < DNS_MESSAGE_HEADERLEN) { return (ISC_R_UNEXPECTEDEND); @@ -1793,15 +1803,6 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, } truncated: - if ((options & DNS_MESSAGEPARSE_CLONEBUFFER) == 0) { - isc_buffer_usedregion(&origsource, &msg->saved); - } else { - msg->saved.length = isc_buffer_usedlength(&origsource); - msg->saved.base = isc_mem_get(msg->mctx, msg->saved.length); - memmove(msg->saved.base, isc_buffer_base(&origsource), - msg->saved.length); - msg->free_saved = 1; - } if (ret == ISC_R_UNEXPECTEDEND && ignore_tc) { return (DNS_R_RECOVERABLE);