libvlc event: Fix the various leaks and point indication on where locking should...

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index e3b8573138c4e74cad1acb91cf42d35a1b33b74f..c4e32e3756b6c755221963a7c0a6e336ca9eec4e 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -813,6 +813,14 @@ VLC_PUBLIC_API void libvlc_event_add_callback( libvlc_instance_t *p_instance,
                                                void *user_data,
                                                libvlc_exception_t *p_e );
 
+/**
+ * Unregister all callbacks notification from an instance
+ * \param p_instance the libvlc instance
+ * \param p_e an initialized exception pointer
+ */
+VLC_PUBLIC_API void libvlc_event_remove_all_callbacks( libvlc_instance_t *p_instance,
+                                                       libvlc_exception_t *p_e );
+
 /**
  * Unregister a callback notification
  * \param p_instance the libvlc instance

diff --git a/src/control/core.c b/src/control/core.c
index f4f5aeb76c83bfcc60a21f5e356e41939c555bf1..23bfa0629c586de61b18184f7c7016d54979ab34 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -107,15 +107,7 @@ libvlc_instance_t * libvlc_new( int argc, char **argv,
 
 void libvlc_destroy( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
 {
-    struct libvlc_callback_entry_list_t *p_listitem = p_instance->p_callback_list;
-
-    while( p_listitem )
-    {
-        struct libvlc_callback_entry_list_t *p_nextlistitem = p_listitem->next;
-        free( p_listitem );
-        p_listitem = p_nextlistitem;
-    }
-    
+    libvlc_event_remove_all_callbacks( p_instance, p_e /* current implementation never triggers it */);
     libvlc_InternalCleanup( p_instance->p_libvlc_int );
     libvlc_InternalDestroy( p_instance->p_libvlc_int, VLC_FALSE );
 }

diff --git a/src/control/event.c b/src/control/event.c
index 723ac03380b4c4b1554860f00a3ac505c9ac931c..3b5775a079e2f572a180cbe73659065fb7811595 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -33,7 +33,7 @@ static int handle_event( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval,
                          void *p_data )
 {
-    struct libvlc_callback_entry_t *entry = p_data;
+    struct libvlc_callback_entry_t *entry = p_data; /* FIXME: we need some locking here */
     libvlc_event_t event;
     event.type = entry->i_event_type;
     switch ( event.type )
@@ -63,7 +63,8 @@ static inline void add_callback_entry( struct libvlc_callback_entry_t *entry,
     /* malloc/free strategy:
      *  - alloc-ded in add_callback_entry
      *  - free-ed by libvlc_event_remove_callback
-     *  - free-ed in libvlc_destroy when entry is destroyed
+     *  - free-ed in libvlc_destroy threw libvlc_event_remove_callback
+     *    when entry is destroyed
      */
     new_listitem = malloc( sizeof( struct libvlc_callback_entry_list_t ) );
     new_listitem->elmt = entry;
@@ -95,8 +96,9 @@ void libvlc_event_add_callback( libvlc_instance_t *p_instance,
     /* malloc/free strategy:
      *  - alloc-ded in libvlc_event_add_callback
      *  - free-ed by libvlc_event_add_callback on error
-     *  - Not free-ed by libvlc_event_remove_callback  (FIXME leaks)
-     *  - Not free-ed in libvlc_destroy when entry is destroyed (FIXME leaks)
+     *  - free-ed by libvlc_event_remove_callback
+     *  - free-ed in libvlc_destroy threw libvlc_event_remove_callback
+     *    when entry is destroyed
      */
     entry = malloc( sizeof( struct libvlc_callback_entry_t ) );
     entry->f_callback = f_callback;
@@ -131,6 +133,23 @@ void libvlc_event_add_callback( libvlc_instance_t *p_instance,
     return;
 }
 
+void libvlc_event_remove_all_callbacks( libvlc_instance_t *p_instance,
+                                       libvlc_exception_t *p_e )
+{
+    struct libvlc_callback_entry_list_t *p_listitem = p_instance->p_callback_list;
+
+    while( p_listitem )
+    {
+        libvlc_event_remove_callback( p_instance,
+            p_listitem->elmt->i_event_type,
+            p_listitem->elmt->f_callback,
+            p_listitem->elmt->p_user_data,
+            p_e);
+        /* libvlc_event_remove_callback will reset the p_callback_list */
+        p_listitem = p_instance->p_callback_list;
+    }
+}
+
 void libvlc_event_remove_callback( libvlc_instance_t *p_instance,
                                    libvlc_event_type_t i_event_type,
                                    libvlc_callback_t f_callback,
@@ -151,8 +170,9 @@ void libvlc_event_remove_callback( libvlc_instance_t *p_instance,
                 p_listitem->prev->next = p_listitem->next;
             else
                 p_instance->p_callback_list = p_listitem->next;
-            
+
             p_listitem->next->prev = p_listitem->prev;
+            free( p_listitem->elmt ); /* FIXME: need some locking here */
             free( p_listitem );
             break;
         }