Fix potential memleak.

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index c6db247c9f0989b22eadaa64dd3f2f16e7f48a72..37e51f26e70ee13b2665c4b8a2b2d30119be9088 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -279,7 +279,7 @@ static void FreeLogoList( logo_list_t *p_logo_list )
         FREENULL( p_logo->psz_file );
         if( p_logo->p_pic )
         {
-            p_logo->p_pic->pf_release( p_logo->p_pic );
+            picture_Release( p_logo->p_pic );
             p_logo->p_pic = NULL;
         }
     }
@@ -331,6 +331,8 @@ static int Create( vlc_object_t *p_this )
     if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
     {
         msg_Err( p_vout, "logo file not specified" );
+        free( p_logo_list->psz_filename );
+        free( p_sys );
         return VLC_EGENERIC;
     }
 
@@ -475,6 +477,10 @@ static void End( vout_thread_t *p_vout )
     vout_sys_t *p_sys = p_vout->p_sys;
     int i_index;
 
+    DEL_PARENT_CALLBACKS( SendEventsToChild );
+
+    DEL_CALLBACKS( p_sys->p_vout, SendEvents );
+
     /* Free the fake output buffers we allocated */
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
@@ -485,9 +491,7 @@ static void End( vout_thread_t *p_vout )
     var_DelCallback( p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
     var_DelCallback( p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
 
-    DEL_CALLBACKS( p_sys->p_vout, SendEvents );
-    vlc_object_detach( p_sys->p_vout );
-    vlc_object_release( p_sys->p_vout );
+    vout_CloseAndRelease( p_sys->p_vout );
 
     if( p_sys->p_blend->p_module )
         module_Unneed( p_sys->p_blend, p_sys->p_blend->p_module );
@@ -503,7 +507,6 @@ static void Destroy( vlc_object_t *p_this )
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     vout_sys_t *p_sys = p_vout->p_sys;
 
-    DEL_PARENT_CALLBACKS( SendEventsToChild );
 
     FreeLogoList( p_sys->p_logo_list );
     free( p_sys->p_logo_list );
@@ -818,7 +821,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     p_pic = p_logo->p_pic;
 
     /* Allocate the subpicture internal data. */
-    p_spu = p_filter->pf_sub_buffer_new( p_filter );
+    p_spu = filter_NewSubpicture( p_filter );
     if( !p_spu )
     {
         vlc_mutex_unlock( &p_logo_list->lock );