* Limit the number of loops in consume_labels() (Closes: #84)

[catta] / avahi-core / dns.c

diff --git a/avahi-core/dns.c b/avahi-core/dns.c
index 66b0bdf8c01e1bfdd57c74823181855bb9af9e7e..fec55e4ca8e902a738e9587e9d1450e742c70f6c 100644 (file)
--- a/avahi-core/dns.c
+++ b/avahi-core/dns.c
@@ -322,7 +322,6 @@ int avahi_dns_packet_check_valid_multicast(AvahiDnsPacket *p) {
     return 0;
 }
 
-
 int avahi_dns_packet_is_query(AvahiDnsPacket *p) {
     assert(p);
     
@@ -333,9 +332,10 @@ static int consume_labels(AvahiDnsPacket *p, unsigned idx, char *ret_name, size_
     int ret = 0;
     int compressed = 0;
     int first_label = 1;
+    int i;
     assert(p && ret_name && l);
     
-    for (;;) {
+    for (i = 0; i < 127; i++) {
         uint8_t n;
 
         if (idx+1 > p->size)
@@ -621,6 +621,9 @@ AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, int *ret_cache_f
     
     if (parse_rdata(p, r, rdlength) < 0)
         goto fail;
+
+    if (!avahi_record_is_valid(r))
+        goto fail;
     
     return r;
 
@@ -634,6 +637,7 @@ fail:
 AvahiKey* avahi_dns_packet_consume_key(AvahiDnsPacket *p, int *ret_unicast_response) {
     char name[256];
     uint16_t type, class;
+    AvahiKey *k;
 
     assert(p);
 
@@ -647,7 +651,15 @@ AvahiKey* avahi_dns_packet_consume_key(AvahiDnsPacket *p, int *ret_unicast_respo
 
     class &= ~AVAHI_DNS_UNICAST_RESPONSE;
     
-    return avahi_key_new(name, class, type);
+    if (!(k = avahi_key_new(name, class, type)))
+        return NULL;
+
+    if (!avahi_key_is_valid(k)) {
+        avahi_key_unref(k);
+        return NULL;
+    }
+
+    return k;
 }
 
 uint8_t* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, int unicast_response) {