There is no need to test a pointer to be freed for being NULL. free() does this anywa...

[catta] / avahi-core / browse-domain.c

diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
index 7a9561148504fcb5f789c5be589ca526e676415b..de3cb1bfea2bbd7a1ca8ddcc803a48450397a4fd 100644 (file)
--- a/avahi-core/browse-domain.c
+++ b/avahi-core/browse-domain.c
@@ -38,7 +38,7 @@ struct AvahiDomainBrowser {
     AVAHI_LLIST_FIELDS(AvahiDomainBrowser, browser);
 };
 
-static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
+static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
     AvahiDomainBrowser *b = userdata;
     gchar *n;
 
@@ -53,13 +53,19 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha
     g_free(n);
 }
 
-AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiDomainBrowserType type, AvahiDomainBrowserCallback callback, gpointer userdata) {
+AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *domain, AvahiDomainBrowserType type, AvahiDomainBrowserCallback callback, gpointer userdata) {
     AvahiDomainBrowser *b;
     AvahiKey *k;
     gchar *n = NULL;
     
     g_assert(server);
     g_assert(callback);
+    g_assert(type >= AVAHI_DOMAIN_BROWSER_BROWSE && type <= AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY);
+
+    if (domain && !avahi_valid_domain_name(domain)) {
+        avahi_server_set_errno(server, AVAHI_ERR_INVALID_DOMAIN_NAME);
+        return NULL;
+    }
 
     b = g_new(AvahiDomainBrowser, 1);
     b->server = server;
@@ -67,6 +73,8 @@ AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, gint interface
     b->callback = callback;
     b->userdata = userdata;
 
+    AVAHI_LLIST_PREPEND(AvahiDomainBrowser, browser, server->domain_browsers, b);
+
     switch (type) {
         case AVAHI_DOMAIN_BROWSER_BROWSE:
             n = g_strdup_printf("b._dns-sd._udp.%s", b->domain_name);
@@ -83,6 +91,10 @@ AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, gint interface
         case AVAHI_DOMAIN_BROWSER_BROWSE_LEGACY:
             n = g_strdup_printf("lb._dns-sd._udp.%s", b->domain_name);
             break;
+
+        case AVAHI_DOMAIN_BROWSER_MAX:
+            g_assert(FALSE);
+            break;
     }
 
     g_assert(n);
@@ -93,7 +105,10 @@ AvahiDomainBrowser *avahi_domain_browser_new(AvahiServer *server, gint interface
     b->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, b);
     avahi_key_unref(k);
 
-    AVAHI_LLIST_PREPEND(AvahiDomainBrowser, browser, server->domain_browsers, b);
+    if (!b->record_browser) {
+        avahi_domain_browser_free(b);
+        return NULL;
+    }
     
     return b;
 }
@@ -103,7 +118,9 @@ void avahi_domain_browser_free(AvahiDomainBrowser *b) {
 
     AVAHI_LLIST_REMOVE(AvahiDomainBrowser, browser, b->server->domain_browsers, b);
 
-    avahi_record_browser_free(b->record_browser);
+    if (b->record_browser)
+        avahi_record_browser_free(b->record_browser);
+    
     g_free(b->domain_name);
     g_free(b);
 }