X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fresolve-host-name.c;h=50fbcf838f4eb0adbca0712a0b9a55ce93e764b0;hb=5d047523c87ba11aad8c384f7ffde25b4dd746ed;hp=0ab2e73fbdcb1f80960d1041103afe8a072889f1;hpb=f43187377e0c89ba02ca23e88efa01bbb255e037;p=catta

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 0ab2e73..50fbcf8 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -23,8 +23,9 @@
 #include <config.h>
 #endif
 
+#include <avahi-common/domain.h>
+#include <avahi-common/timeval.h>
 #include "browse.h"
-#include "util.h"
 
 struct AvahiHostNameResolver {
     AvahiServer *server;
@@ -107,7 +108,7 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
 AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) {
     AvahiHostNameResolver *r;
     AvahiKey *k;
-    GTimeVal tv;
+    struct timeval tv;
     
     g_assert(server);
     g_assert(host_name);
@@ -115,6 +116,11 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, AvahiIf
 
     g_assert(aprotocol == AVAHI_PROTO_UNSPEC || aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_INET6);
 
+    if (!avahi_valid_domain_name(host_name)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_HOST_NAME);
+        return NULL;
+    }
+    
     r = g_new(AvahiHostNameResolver, 1);
     r->server = server;
     r->host_name = avahi_normalize_name(host_name);
@@ -127,20 +133,34 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, AvahiIf
     r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
 
     AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
+
+    r->record_browser_aaaa = r->record_browser_a = NULL;
     
     if (aprotocol == AVAHI_PROTO_INET || aprotocol == AVAHI_PROTO_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
         r->record_browser_a = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
+
+        if (!r->record_browser_a)
+            goto fail;
     } 
 
     if (aprotocol == AVAHI_PROTO_INET6 || aprotocol == AVAHI_PROTO_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
         r->record_browser_aaaa = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
+
+        if (!r->record_browser_aaaa)
+            goto fail;
     }
-    
+
+    g_assert(r->record_browser_aaaa || r->record_browser_a);
+
     return r;
+
+fail:
+    avahi_host_name_resolver_free(r);
+    return NULL;
 }
 
 void avahi_host_name_resolver_free(AvahiHostNameResolver *r) {