Fix potential memleak.

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index aad0f1d7bf8f5f9d0b0b49ab7b3e3bc30e226969..37e51f26e70ee13b2665c4b8a2b2d30119be9088 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 
@@ -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;
         }
     }
@@ -315,14 +315,10 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_sys = p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return VLC_ENOMEM;
-    }
     p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
     if( p_logo_list == NULL )
     {
-        msg_Err( p_vout, "out of memory" );
         free( p_sys );
         return VLC_ENOMEM;
     }
@@ -335,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;
     }
 
@@ -479,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 ; )
     {
@@ -489,12 +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);
 
-    if( p_sys->p_vout )
-    {
-        DEL_CALLBACKS( p_sys->p_vout, SendEvents );
-        vlc_object_detach( p_sys->p_vout );
-        vout_Destroy( 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 );
@@ -510,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 );
@@ -583,7 +579,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
     /* This is a new frame. Get a structure from the video_output. */
     while( !(p_outpic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 )) )
     {
-        if( p_vout->b_die || p_vout->b_error ) return;
+        if( !vlc_object_alive (p_vout) || p_vout->b_error ) return;
         msleep( VOUT_OUTMEM_SLEEP );
     }
 
@@ -711,14 +707,10 @@ static int CreateFilter( vlc_object_t *p_this )
     /* Allocate structure */
     p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
     p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
     if( p_logo_list == NULL )
     {
-        msg_Err( p_filter, "out of memory" );
         free( p_sys );
         return VLC_ENOMEM;
     }
@@ -829,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 );