From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Dec 2015 18:31:21 +0000 (+0100)
Subject: resolved: properly determine size of DnsAnswer object
X-Git-Tag: v229~201^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea207b639a379b2a0bb8f2cafb0893e406c6152e;p=thirdparty%2Fsystemd.git

resolved: properly determine size of DnsAnswer object

After all we want to allow NULL DnsAnswer objects as equivalent to empty
ones, hence we should use the right checks everywhere.
---

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index 451875ece01..84ae8b59f9f 100644
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -477,7 +477,7 @@ int dns_cache_put(
                 dns_cache_remove(c, key);
         }
 
-        if (!answer) {
+        if (dns_answer_size(answer) <= 0) {
                 if (log_get_max_level() >= LOG_DEBUG) {
                         _cleanup_free_ char *key_str = NULL;
 
@@ -506,7 +506,7 @@ int dns_cache_put(
         if (!IN_SET(rcode, DNS_RCODE_SUCCESS, DNS_RCODE_NXDOMAIN))
                 return 0;
 
-        cache_keys = answer->n_rrs;
+        cache_keys = dns_answer_size(answer);
         if (key)
                 cache_keys ++;