Services discoveries: check memory allocation

[vlc] / modules / services_discovery / bonjour.c

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index 3a7c742501d7fc0bdea95643684689d33328e325..482809ac5b8ed4409ea4bf5ca3e81baafb3c9d02 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -24,10 +24,14 @@
 /*****************************************************************************
  * Includes
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_playlist.h>
+#include <vlc_arrays.h>
 
 #include <avahi-client/client.h>
 #ifdef HAVE_AVAHI_06
@@ -61,13 +65,10 @@ vlc_module_end();
 
 struct services_discovery_sys_t
 {
-    /* playlist node */
-    playlist_item_t     *p_node_cat, *p_node_one;
-    playlist_t          *p_playlist;
-
     AvahiSimplePoll     *simple_poll;
     AvahiClient         *client;
     AvahiServiceBrowser *sb;
+    vlc_dictionary_t    services_name_to_input_item;
 };
 
 /*****************************************************************************
@@ -120,6 +121,11 @@ static void resolve_callback(
 {
     services_discovery_t *p_sd = ( services_discovery_t* )userdata;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
+    
+    VLC_UNUSED(interface); VLC_UNUSED(host_name);
+#ifdef HAVE_AVAHI_06
+    VLC_UNUSED(flags);
+#endif
 
 #ifdef HAVE_AVAHI_06
     if( event == AVAHI_RESOLVER_FAILURE )
@@ -144,7 +150,8 @@ static void resolve_callback(
 
         avahi_address_snprint(a, (sizeof(a)/sizeof(a[0]))-1, address);
         if( protocol == AVAHI_PROTO_INET6 )
-            asprintf( &psz_addr, "[%s]", a );
+            if( asprintf( &psz_addr, "[%s]", a ) == -1 )
+                return;
 
         if( txt != NULL )
             asl = avahi_string_list_find( txt, "path" );
@@ -156,8 +163,12 @@ static void resolve_callback(
             if( avahi_string_list_get_pair( asl, &key, &value, &size ) == 0 &&
                 value != NULL )
             {
-                asprintf( &psz_uri, "http://%s:%d%s",
-                          psz_addr != NULL ? psz_addr : a, port, value );
+                if( asprintf( &psz_uri, "http://%s:%d%s",
+                          psz_addr != NULL ? psz_addr : a, port, value ) == -1 )
+                {
+                    free( psz_addr );
+                    return;
+                }
             }
             if( key != NULL )
                 avahi_free( (void *)key );
@@ -166,8 +177,12 @@ static void resolve_callback(
         }
         else
         {
-            asprintf( &psz_uri, "http://%s:%d",
-                      psz_addr != NULL ? psz_addr : a, port );
+            if( asprintf( &psz_uri, "http://%s:%d",
+                      psz_addr != NULL ? psz_addr : a, port ) == -1 )
+            {
+                free( psz_addr );
+                return;
+            }
         }
 
         if( psz_addr != NULL )
@@ -180,17 +195,10 @@ static void resolve_callback(
         }
         if( p_input != NULL )
         {
-            playlist_item_t *p_item;
-            p_item = playlist_NodeAddInput( p_sys->p_playlist, p_input,
-                                            p_sys->p_node_cat,
-                                            PLAYLIST_APPEND, PLAYLIST_END );
-            p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-            p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
-            p_item = playlist_NodeAddInput( p_sys->p_playlist, p_input,
-                                            p_sys->p_node_one,
-                                            PLAYLIST_APPEND, PLAYLIST_END );
-            p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-            p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
+            vlc_dictionary_insert( &p_sys->services_name_to_input_item,
+                name, p_input );
+            services_discovery_AddItem( p_sd, p_input, NULL /* no category */ );
+            vlc_gc_decref( p_input );
        }
     }
 
@@ -213,9 +221,12 @@ static void browse_callback(
 #endif
     void* userdata )
 {
+    VLC_UNUSED(b);
+#ifdef HAVE_AVAHI_06
+    VLC_UNUSED(flags);
+#endif
     services_discovery_t *p_sd = ( services_discovery_t* )userdata;
     services_discovery_sys_t *p_sys = p_sd->p_sys;
-
     if( event == AVAHI_BROWSER_NEW )
     {
         if( avahi_service_resolver_new( p_sys->client, interface, protocol,
@@ -229,17 +240,21 @@ static void browse_callback(
                      avahi_strerror( avahi_client_errno( p_sys->client ) ) );
         }
     }
-    else
+    else if( name )
     {
         /** \todo Store the input id and search it, rather than searching the items */
-        playlist_item_t *p_item;
-        p_item = playlist_ChildSearchName( p_sys->p_node_cat, name );
-        if( p_item == NULL )
+        input_item_t *p_item;
+        p_item = vlc_dictionary_value_for_key(
+                        &p_sys->services_name_to_input_item,
+                        name );
+        if( !p_item )
             msg_Err( p_sd, "failed to find service '%s' in playlist", name );
         else
         {
-            playlist_LockDeleteAllFromInput( p_sys->p_playlist,
-                                              p_item->p_input->i_id );
+            services_discovery_RemoveItem( p_sd, p_item );
+            vlc_dictionary_remove_value_for_key(
+                        &p_sys->services_name_to_input_item,
+                        name );
         }
     }
 }
@@ -251,20 +266,18 @@ static int Open( vlc_object_t *p_this )
 {
     services_discovery_t *p_sd = ( services_discovery_t* )p_this;
     services_discovery_sys_t *p_sys;
-    playlist_view_t *p_view;
-    vlc_value_t val;
     int err;
 
     p_sd->p_sys = p_sys = (services_discovery_sys_t *)malloc(
         sizeof( services_discovery_sys_t ) );
-    if( p_sd->p_sys == NULL )
-    {
-        msg_Err( p_sd, "out of memory" );
-        return VLC_EGENERIC;
-    }
+
+    if( !p_sys )
+        return VLC_ENOMEM;
 
     memset( p_sys, 0, sizeof(*p_sys) );
 
+    vlc_dictionary_init( &p_sys->services_name_to_input_item, 1 );
+
     p_sys->simple_poll = avahi_simple_poll_new();
     if( p_sys->simple_poll == NULL )
     {
@@ -297,25 +310,13 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
-    /* Create our playlist node */
-    p_sys->p_playlist = (playlist_t *)vlc_object_find( p_sd,
-                                                       VLC_OBJECT_PLAYLIST,
-                                                       FIND_ANYWHERE );
-    if( !p_sys->p_playlist )
-    {
-        msg_Warn( p_sd, "unable to find playlist, cancelling");
-        goto error;
-    }
+    services_discovery_SetLocalizedName( p_sd, _("Bonjour") );
 
-    playlist_NodesCreateForSD( p_sys->p_playlist, _("Bonjour"),
-                              &p_sys->p_node_cat,&p_sys->p_node_one );
     p_sd->pf_run = Run;
 
     return VLC_SUCCESS;
 
 error:
-    if( p_sys->p_playlist != NULL )
-        vlc_object_release( p_sys->p_playlist );
     if( p_sys->sb != NULL )
         avahi_service_browser_free( p_sys->sb );
     if( p_sys->client != NULL )
@@ -323,7 +324,8 @@ error:
     if( p_sys->simple_poll != NULL )
         avahi_simple_poll_free( p_sys->simple_poll );
 
-    free( (void *)p_sys );
+    vlc_dictionary_clear( &p_sys->services_name_to_input_item );
+    free( p_sys );
 
     return VLC_EGENERIC;
 }
@@ -340,10 +342,7 @@ static void Close( vlc_object_t *p_this )
     avahi_client_free( p_sys->client );
     avahi_simple_poll_free( p_sys->simple_poll );
 
-    playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node_one, VLC_TRUE, VLC_TRUE );
-    playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node_cat, VLC_TRUE, VLC_TRUE );
-    vlc_object_release( p_sys->p_playlist );
-
+    vlc_dictionary_clear( &p_sys->services_name_to_input_item );
     free( p_sys );
 }