From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 31 Jul 2014 16:02:42 +0000 (+0200)
Subject: resolved: make sure we always initialize r when parsing TXT records
X-Git-Tag: v216~331
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6a6fc3df74c8ed91d4ea1813b3f6a6c3bf48a288;p=elogind.git

resolved: make sure we always initialize r when parsing TXT records
---

diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index 5d4e097c7..05c62a497 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -524,6 +524,7 @@ int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, size_t *star
                                 goto fail;
                 }
 
+                r = 0;
                 break;
         }
 
@@ -977,7 +978,9 @@ int dns_packet_read_rr(DnsPacket *p, DnsResourceRecord **ret, size_t *start) {
                         r = strv_consume(&rr->txt.strings, s);
                         if (r < 0)
                                 goto fail;
-                };
+                }
+
+                r = 0;
                 break;
         }