From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Jul 2015 02:54:35 +0000 (+0200)
Subject: resolved: make sure we alway initialize *start in dns_packet_append_type_window()
X-Git-Tag: v223~65^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F673%2Fhead;p=thirdparty%2Fsystemd.git

resolved: make sure we alway initialize *start in dns_packet_append_type_window()
---

diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index b1cde4ab35e..12cd524c40f 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -509,22 +509,22 @@ static int dns_packet_append_type_window(DnsPacket *p, uint8_t window, uint8_t l
         assert(p);
         assert(types);
 
-        if (length == 0)
-                return 0;
-
         saved_size = p->size;
 
-        r = dns_packet_append_uint8(p, window, NULL);
-        if (r < 0)
-                goto fail;
+        if (length != 0) {
 
-        r = dns_packet_append_uint8(p, length, NULL);
-        if (r < 0)
-                goto fail;
+                r = dns_packet_append_uint8(p, window, NULL);
+                if (r < 0)
+                        goto fail;
 
-        r = dns_packet_append_blob(p, types, length, NULL);
-        if (r < 0)
-                goto fail;
+                r = dns_packet_append_uint8(p, length, NULL);
+                if (r < 0)
+                        goto fail;
+
+                r = dns_packet_append_blob(p, types, length, NULL);
+                if (r < 0)
+                        goto fail;
+        }
 
         if (start)
                 *start = saved_size;