From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 4 Nov 2020 19:42:02 +0000 (+0100)
Subject: resolved: add minor optimization path to dns_answer_merge()
X-Git-Tag: v247-rc2~21^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=032b3982240f164f9b839bda3ea8e96ce7e1d925;p=thirdparty%2Fsystemd.git

resolved: add minor optimization path to dns_answer_merge()
---

diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c
index 823c138b346..1939ec163e3 100644
--- a/src/resolve/resolved-dns-answer.c
+++ b/src/resolve/resolved-dns-answer.c
@@ -321,6 +321,11 @@ int dns_answer_merge(DnsAnswer *a, DnsAnswer *b, DnsAnswer **ret) {
 
         assert(ret);
 
+        if (a == b) {
+                *ret = dns_answer_ref(a);
+                return 0;
+        }
+
         if (dns_answer_size(a) <= 0) {
                 *ret = dns_answer_ref(b);
                 return 0;