Merge pull request #673 from poettering/dns-packet-append-type-window

resolved: make sure we alway initialize *start in dns_packet_append_t…

1 files changed, 12 insertions, 12 deletions

diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index b1cde4ab35..12cd524c40 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;