From 75cd513ef830d8e00d0d2d6a64917fec533315db Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sun, 3 Aug 2014 22:41:25 +0200 Subject: [PATCH] resolved: avoid possible dereference of null pointer In dns_scope_make_reply_packet the structs q, answer, and soa can be null. We should check for null before reading their fields. --- src/resolve/resolved-dns-scope.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 8d03049c1..0f654a610 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -412,7 +412,9 @@ static int dns_scope_make_reply_packet( assert(s); - if (q->n_keys <= 0 && answer->n_rrs <= 0 && soa->n_rrs <= 0) + if ((!q || q->n_keys <= 0) + && (!answer || answer->n_rrs <= 0) + && (!soa || soa->n_rrs <= 0)) return -EINVAL; r = dns_packet_new(&p, s->protocol, 0); -- 2.30.2