| From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001 |
| From: Evgeny Vereshchagin <evvers@ya.ru> |
| Date: Wed, 24 May 2017 08:56:48 +0300 |
| Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing |
| (#6020) |
| |
| See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396 |
| |
| [Upstream commit: https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be] |
| Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| --- |
| src/resolve/resolved-dns-packet.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c |
| index 652970284e..240ee448f4 100644 |
| --- a/src/resolve/resolved-dns-packet.c |
| +++ b/src/resolve/resolved-dns-packet.c |
| @@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const DnsResourceKey *key) { |
| if (r < 0) |
| return r; |
| |
| + if (!p->question) |
| + return 0; |
| + |
| if (p->question->n_keys != 1) |
| return 0; |
| |